Avans/CrystalPoint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'developer' into johan

Browse Source 
# Conflicts:
#	World.cpp
#	worlds/world1.json
This commit is contained in:
Remco
2016-05-23 10:34:21 +02:00
parent d01efecb0e 47c228205a
commit 9d3cfa7e2a
13 changed files with 776 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Entity.cpp
+1 -2
View File
@@ -1,7 +1,6 @@
#include "Entity.h"
#include "cmath"
#include <GL/freeglut.h>
#include "Model.h"