[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1480937 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1480937 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1480937/+merge/267230 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1480937. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1480937 into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1480937 into
lp:widelands.
Requested reviews:
Hans Joachim Desserud (hjd)
Related bugs:
Bug #1480937 in widelands: "Escape key doesn't work in all dialogues"
https://bugs.launchpad.net/widelands/+bug/1480937
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1480937/+merge/267587
This should fix clang compilation.
--
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1480937.
=== modified file 'src/ui_fsmenu/base.h'
--- src/ui_fsmenu/base.h 2015-08-06 17:14:34 +
+++ src/ui_fsmenu/base.h 2015-08-10 20:03:31 +
@@ -41,8 +41,8 @@
class FullscreenMenuBase : public UI::Panel {
public:
enum class MenuTarget {
- kBack = UI::Panel::Returncodes::kBack,
- kOk = UI::Panel::Returncodes::kOk,
+ kBack = static_cast(UI::Panel::Returncodes::kBack),
+ kOk = static_cast(UI::Panel::Returncodes::kOk),
// Options
kRestart,
___
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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1480937 into lp:widelands
Review: Approve lgtm, but not tested clang compilation. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1480937/+merge/267587 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1480937. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1480937 into lp:widelands
I will merge this, so the recipes will tell us. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1480937/+merge/267587 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1480937. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1480937 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1480937 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1480937/+merge/267587 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1480937. ___ 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
