Merge branch 'master' into wp8

2013-12-08 14:17:42 +01:00
parent f550784973 89fb76a8e7
commit 3af4546ef7
59 changed files with 2368 additions and 1486 deletions
--- a/projects/mtg/include/ObjectAnalytics.h
+++ b/projects/mtg/include/ObjectAnalytics.h
@@ -1,6 +1,9 @@
 #ifndef OBJECTANALYTICS_H
 #define OBJECTANALYTICS_H

+//#include <boost/cstdint.hpp>
+#include "JTypes.h"
+
 #ifdef _DEBUG
 #define TRACK_OBJECT_USAGE
 #endif