Merge branch 'developer' into feature/Menu

2016-06-20 20:39:00 +02:00
parent 3701918ac9 d887328907
commit ce2f658b61
24 changed files with 87 additions and 43 deletions
@@ -1,5 +1,5 @@
 #include "Cursor.h"
-#include <GL\freeglut.h>
+#include <GL/freeglut.h>
 #include <cmath>
 #include "CrystalPoint.h"