widelands-dev team mailing list archive

[bunnybot <widelandsofficial@xxxxxxxxx>]

Error merging this proposal:

Output:
stdout:

stderr:
bzr: ERROR: Parameter 'Merged lp:~widelands-dev/widelands/bug-1731652-worker-plant-attribute:\nRemoved "tribe:" parameter from workers\' "plant" program\n\n- The worker program "plant" no longer takes "tribe:" as a parameter;\n  immovables are now identified via their attibutes only, and both world\n  and tribe immovables are searched\n\n- As a side effect, tribe immovables can now have terrain affinity\n\n- Code cleanup: helptext_script() is now a function of MapObject\n\n- Code Cleanup: Renamed "build_cost" to "buildcost" for consistency\n\n- Documentation: Added immovables to in-game help and documented\n\xc2\xa0\xc2\xa0worker helptexts.' encoding is unsupported by ascii application locale.


-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1731652-worker-plant-attribute/+merge/333934
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1731652-worker-plant-attribute.