widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #17947
Re: [Merge] lp:~widelands-dev/widelands/toolbar-dropdown-scripting-review-only into lp:widelands
I think it's just Launchpad or Bunnybot getting confused because of the unmerged prerequisite in their messages. The code in trunk is fine - the new UI test got added. which means that the correct branch was merged.
clang-format separated some translators' comments from their strings though, so I'll have to fix trunk for that.
--
https://code.launchpad.net/~widelands-dev/widelands/toolbar-dropdown-scripting-review-only/+merge/368228
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/toolbar-dropdown-scripting-review-only into lp:widelands.
References