damnit TortoiseMerge (fix newline and crap)

2014-01-26 17:57:13 -06:00
parent 8a0c218282
commit 6ae71631d4
1 changed files with 4 additions and 2 deletions
@@ -369,10 +369,12 @@ class LunaScreenWithMenuElements: public Luna<ScreenWithMenuElements>
 public:
 	static int Cancel( T* p, lua_State *L )		{ p->Cancel( SM_GoToPrevScreen ); return 0; }
 	static int IsTransitioning( T* p, lua_State *L ) { lua_pushboolean( L, p->IsTransitioning() ); return 1; }
+
 	LunaScreenWithMenuElements()
 	{
-  		ADD_METHOD( Cancel );
-	ADD_METHOD( IsTransitioning );	}
+		ADD_METHOD( Cancel );
+		ADD_METHOD( IsTransitioning );
+	}
 };

 LUA_REGISTER_DERIVED_CLASS( ScreenWithMenuElements, Screen )