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

BTW merging this should also make Trunk compile again, because of this line: === modified file 'src/logic/cmd_queue.h' --- src/logic/cmd_queue.h 2014-05-11 12:29:55 + +++ src/logic/cmd_queue.h 2014-05-28 13:43:10 + @@ -22,6 +22,7 @@ #include memory #include queue +#include

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

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1293158 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1293158 in widelands: Odd line in information tool in editor https://bugs.launchpad.net/widelands/+bug/1293158 For more