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

2019-01-14 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi/+merge/361703 -- Y

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

2019-01-14 Thread hessenfarmer
@bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi/+merge/361703 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi. ___

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

2019-01-14 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 4399. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/478962324. --

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

2019-01-14 Thread hessenfarmer
Review: Approve review forgot to approve the branch. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi/+merge/361703 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi.

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

2019-01-14 Thread hessenfarmer
Changes look good. Travis error is transient. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi/+merge/361703 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug

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

2019-01-13 Thread bunnybot
/_widelands_dev_widelands_bug_1805155_frisian_bushes_and_resi-4190. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi/+merge/361703 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi into lp:widelands

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

2019-01-12 Thread bunnybot
/_widelands_dev_widelands_bug_1805155_frisian_bushes_and_resi-4184. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi/+merge/361703 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi into lp:widelands

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

2019-01-12 Thread kaputtnik
resources, added textdomain to blueberry bushes. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi into lp:widelands. === modified file 'data/tribes/immovables/berry_bushes/blueberry/init.lua' --- d