Merge lp:~widelands-dev/widelands/test_merge into lp:widelands

[SirVer]

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

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

[SirVer (sirver)]

@bunnybot merge

[bunnybot (widelandsofficial)]

Fooo

[bunnybot (widelandsofficial)]

Fooo

[SirVer (sirver)]

@bunnybot merge

[bunnybot (widelandsofficial)]

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.

[bunnybot (widelandsofficial)]

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.

=== modified file 'src/base/macros.h'
--- src/base/macros.h	2017-07-01 20:32:02 +0000
+++ src/base/macros.h	2017-08-06 21:16:27 +0000
@@ -17,6 +17,8 @@
  *
  */
 
+this is a syntax error.
+
 #ifndef WL_BASE_MACROS_H
 #define WL_BASE_MACROS_H