[Widelands-dev] [Merge] lp:~widelands-dev/widelands/test_merge into lp:widelands

2017-08-07 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/test_merge into lp:widelands 
has been updated.

Status: Needs review => Rejected

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/test_merge/+merge/328636
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/test_merge into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/test_merge into lp:widelands

2017-08-07 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for 
merging anyways.

Travis build 2510. State: canceled. Details: 
https://travis-ci.org/widelands/widelands/builds/261757886.
-- 
https://code.launchpad.net/~widelands-dev/widelands/test_merge/+merge/328636
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/test_merge into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/test_merge into lp:widelands

2017-08-07 Thread bunnybot
Continuous integration builds have changed state:

Travis build 2510. State: canceled. Details: 
https://travis-ci.org/widelands/widelands/builds/261757886.
Appveyor build 2334. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_test_merge-2334.
-- 
https://code.launchpad.net/~widelands-dev/widelands/test_merge/+merge/328636
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/test_merge into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/test_merge into lp:widelands

2017-08-07 Thread bunnybot
Fooo
-- 
https://code.launchpad.net/~widelands-dev/widelands/test_merge/+merge/328636
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/test_merge into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/test_merge into lp:widelands

2017-08-07 Thread SirVer
@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/test_merge/+merge/328636
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/test_merge into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/test_merge into lp:widelands

2017-08-07 Thread bunnybot
Fooo
-- 
https://code.launchpad.net/~widelands-dev/widelands/test_merge/+merge/328636
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/test_merge into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/test_merge into lp:widelands

2017-08-07 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/test_merge into lp:widelands 
has been updated.

Status: Rejected => Needs review

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/test_merge/+merge/328636
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/test_merge into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/test_merge into lp:widelands

2017-08-06 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/test_merge into lp:widelands 
has been updated.

Status: Needs review => Rejected

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/test_merge/+merge/328636
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/test_merge into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/test_merge into lp:widelands

2017-08-06 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/test_merge into 
lp:widelands.

Commit message:
This is a test branch to check a refactoring of bunnybot. Please ignore.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/test_merge/+merge/328636

This is a test branch to check a refactoring of bunnybot. Please ignore.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/test_merge into lp:widelands.
=== modified file 'src/base/macros.h'
--- src/base/macros.h	2017-07-01 20:32:02 +
+++ src/base/macros.h	2017-08-06 21:16:27 +
@@ -17,6 +17,8 @@
  *
  */
 
+this is a syntax error.
+
 #ifndef WL_BASE_MACROS_H
 #define WL_BASE_MACROS_H
 

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/test_merge into lp:widelands

2017-08-06 Thread SirVer
@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/test_merge/+merge/328636
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/test_merge into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp