widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #04829
Re: [Merge] lp:~widelands-dev/widelands/forested_mountain_terrain into lp:widelands
We could go with "likes trees" or "tree friendly".
I will look at the code. If you are unsure about C++ merge conflicts in the future, you can submit the branch without a merge and let me have a look. Most often, I will have been the one fiddling with the code, so I'll have the reason for the changes in my head.
--
https://code.launchpad.net/~widelands-dev/widelands/forested_mountain_terrain/+merge/280198
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/forested_mountain_terrain into lp:widelands.
References