Merge branch 'develop' into rooms

2015-01-03 03:27:34 +11:00
parent 92eb75af7e 877c0f59d3
commit 3322783d95
27 changed files with 29 additions and 139 deletions
@@ -25,11 +25,7 @@
 #include "bounding_box.hpp"
 #include "vector2.hpp"

-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"

 #include <string>