Review: Approve
LTGM
--
https://code.launchpad.net/~widelands-dev/widelands/fix_resolution_change_mouse_bug/+merge/330888
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/fix_resolution_change_mouse_bug.
___
Mailing
The proposal to merge lp:~widelands-dev/widelands/market into lp:widelands has
been updated.
Commit Message changed to:
Adds a new building type called 'Market' that will be the trading building for
land-based trading. The building is only added to the barbarians and is is
disabled in all
removed non-breaking space from commit message.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/market/+merge/330830
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/market.
___
Mailing list:
Error merging this proposal:
Output:
stdout:
stderr:
+N data/tribes/buildings/markets/
+N data/tribes/buildings/markets/barbarians/
+N data/tribes/buildings/markets/barbarians/market/
+N data/tribes/buildings/markets/barbarians/market/build_00.png
+N
This was a bunnybot bug, fixed in
https://github.com/widelands/bunnybot/commit/a12a09ac28b71ff62206627ff693d78fc94cf1c4.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/market/+merge/330830
Your team Widelands Developers is subscribed to branch
Error merging this proposal:
Output:
stdout:
stderr:
bzr: ERROR: Parameter "Merged lp:~widelands-dev/widelands/market:\nAdds a new
building type called 'Market' that will be the trading building for land-based
trading. The building is only added to the barbarians and is is disabled in all
The proposal to merge lp:~widelands-dev/widelands/market into lp:widelands has
been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/market/+merge/330830
--
Your team Widelands Developers is subscribed to branch
Thanks. There is not much code to review, so I'm gonna merge.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/fix_resolution_change_mouse_bug/+merge/330888
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/fix_resolution_change_mouse_bug.
Fixed the nit that Gun asked for. Thanks for testing and code review!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/market/+merge/330830
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/market.
Continuous integration builds have changed state:
Travis build 2676. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/276586857.
Appveyor build 2497. State: success. Details:
The proposal to merge
lp:~widelands-dev/widelands/fix_resolution_change_mouse_bug into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_resolution_change_mouse_bug/+merge/330888
--
Your team
11 matches
Mail list logo
