Merge branch 'master' of https://github.com/WagicProject/wagic

Conflicts: JGE/include/JTypes.h
2013-10-29 23:36:07 +01:00
parent a3a1bc2b79 9037699281
commit f08f0ad3b9
180 changed files with 725 additions and 23783 deletions
@@ -13,7 +13,7 @@ Author: Michael Nguyen
 /* Wagic versions */
 #define WAGIC_VERSION_MAJOR     0
 #define WAGIC_VERSION_MEDIUM    19
-#define WAGIC_VERSION_MINOR     1
+#define WAGIC_VERSION_MINOR     2

 #define VERSION_DOT(a, b, c) a ##.## b ##.## c
 #define VERSION_WITHOUT_DOT(a, b, c) a ## b ## c
@@ -30,4 +30,4 @@ Author: Michael Nguyen

 #endif

-		
+