Changeset 2665 for code/branches/buildsystem3/src/orxonox/pch/havepch

Timestamp:

Feb 14, 2009, 11:35:12 PM (16 years ago)

Author:

rgrieder

Message:

Manual merge.

File:

• code/branches/buildsystem3/src/orxonox/pch/havepch/OrxonoxStableHeaders.h (modified) (3 diffs)

code/branches/buildsystem3/src/orxonox/pch/havepch/OrxonoxStableHeaders.h

@@ -47 +47 @@
 #include <Ogre.h>
 #include <CEGUI.h>
-#include "ois/OIS.h"
 #include <boost/thread/recursive_mutex.hpp>
 //#include <boost/thread/mutex.hpp>
@@ -53 +52 @@
 //#include <boost/thread/thread.hpp>
 #include <boost/static_assert.hpp>
-#include <ticpp.h>
+
+#include <BulletDynamics/Dynamics/btRigidBody.h>
+#include <ois/OIS.h>
+#include <tinyxml/ticpp.h>
 #include <tolua++.h>
 
@@ -94 +96 @@
 #include "core/input/InputManager.h"
 
-#include "network/Synchronisable.h"
+#include "network/synchronisable/Synchronisable.h"
 
-#include "Settings.h"
+//#include "Settings.h"
 
 //#endif /* ifdef NDEBUG */