Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Conflicts:
	Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
	Escape-the-Dawn/GameWorld.cpp
This commit is contained in:
Adam
2014-03-14 01:53:22 +01:00
37 changed files with 529 additions and 244 deletions
-1
View File
@@ -7,7 +7,6 @@
#include <AL/al.h>
#include <AL/alc.h>
#include <vector>
#include <glm/gtx/quaternion.hpp>
namespace Systems
{