Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai-hint-debug into lp:widelands

2018-12-20 Thread Toni Förster
@bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug into lp:widelands. ___ Mailin

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai-hint-debug into lp:widelands

2018-12-20 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/ai-hint-debug into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 -- Your team Widelands Developers is requested to review

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-skip-translations-in-debug-builds into lp:widelands

2018-12-20 Thread Notabilis
Review: Approve Diff is looking good and based on the Travis output it seems to work as intented. -- https://code.launchpad.net/~widelands-dev/widelands/travis-skip-translations-in-debug-builds/+merge/359347 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/trav

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai-hint-debug into lp:widelands

2018-12-20 Thread Toni Förster
The 'CommentPragmas:' in the file '.clang-format' does work. But it only applies to a line and not a codeblock. According to the documentation this is needed: // clang-format off some code that must not be formatted // clang-format on -- https://code.launchpad.net/~widelands-dev/widelands/ai

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-boost-168 into lp:widelands

2018-12-20 Thread bunnybot
Continuous integration builds have changed state: Travis build 4352. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/470524367. Appveyor build 4146. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_bo

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

2018-12-20 Thread noreply
The proposal to merge lp:~widelands-dev/widelands-website/internal_forum into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/internal_forum/+merge/360917 -- Your team Widelands Develope

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

2018-12-20 Thread kaputtnik
This is merged and deployed now. Thanks to janus for his comments and support :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/internal_forum/+merge/360917 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/internal_f

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

2018-12-20 Thread bunnybot
Continuous integration builds have changed state: Travis build 4354. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/470617783. Appveyor build 4148. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1807701