widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

LGTM - if you're happy with the code, could you please fix the conflicts and merge for me?

For the text conflicts, we need the following format:

trend_ = Trend::kRising;
color = UI_FONT_CLR_GOOD.hex_value();

-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1454371/+merge/261375
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1454371 into lp:widelands.