Commit Graph

2 Commits

Author SHA1 Message Date
ViktorLjung 3a57a18b4f Kameran följer spelaren :3 2014-03-13 20:51:47 +01:00
ViktorLjung 01f2ebfa20 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Systems/LevelGenerationSystem.cpp
	Escape-the-Dawn/Systems/PlayerSystem.cpp
2014-03-13 19:36:03 +01:00