Merge branch 'master' into master

1 files changed, 4 insertions, 3 deletions

diff --git a/src/script/scripting_mainmenu.h b/src/script/scripting_mainmenu.h
index 16d0a0cc0..9e23bdc1b 100644
--- a/src/script/scripting_mainmenu.h
+++ b/src/script/scripting_mainmenu.h
@@ -27,10 +27,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 /* Scripting <-> Main Menu Interface                                         */
 /*****************************************************************************/
 
-class MainMenuScripting : virtual public ScriptApiBase, public ScriptApiMainMenu
+class MainMenuScripting
+		: virtual public ScriptApiBase,
+		  public ScriptApiMainMenu
 {
 public:
-	MainMenuScripting(GUIEngine *guiengine);
+	MainMenuScripting(GUIEngine* guiengine);
 
 	// Global step handler to pass back async events
 	void step();
@@ -38,7 +40,6 @@ public:
 	// Pass async events from engine to async threads
 	unsigned int queueAsync(const std::string &serialized_func,
 			const std::string &serialized_params);
-
 private:
 	void initializeModApi(lua_State *L, int top);
 	static void registerLuaClasses(lua_State *L, int top);