Merge remote-tracking branch 'origin/master' into ResolutionChange

2016-02-19 13:17:31 +01:00
parent 8c9f4bb84b 2ac584bafb
commit cf2bf4e14d
28 changed files with 639 additions and 69 deletions
@@ -23,6 +23,7 @@
 #include "imgui/imgui.h"
 #include "TextPass.h"
 #include "Util/CommonFunctions.h"
+#include "Core/PerformanceTimer.h"

 class Renderer : public IRenderer
 {