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. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
