widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #07868
[Merge] lp:~hjd/widelands/semicolon into lp:widelands
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/semicolon into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~hjd/widelands/semicolon/+merge/300231
Skimmed warnings printed when building and found this.
--
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/semicolon into lp:widelands.
=== modified file 'src/logic/game_controller.h'
--- src/logic/game_controller.h 2016-05-14 18:18:51 +0000
+++ src/logic/game_controller.h 2016-07-15 18:37:44 +0000
@@ -83,7 +83,7 @@
*/
bool is_paused_or_zero_speed() {
return is_paused() || real_speed() == 0;
- };
+ }
/**
* Sets whether the game is paused.
Follow ups