3 Commits

Author	SHA1	Message	Date
Jace	7f344263da	Merge branch 'master' into gui ... Conflicts: include/Game/GUI/HUD.h src/game/Core/Renderer.cpp	2015-10-08 23:47:25 +02:00
Jace	856053e3f2	Forgot this when moving game GUI to a subfolder... I guess.	2015-10-08 21:51:13 +02:00
Jace	7bf1d7cf24	Moved game GUI to its own subfolder	2015-10-08 10:46:28 +02:00