- Timestamp:
- Dec 15, 2008, 12:53:05 AM (15 years ago)
- Location:
- code/branches/presentation
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation
- Property svn:mergeinfo changed
-
code/branches/presentation/src/orxonox/OrxonoxStableHeaders.h
r2371 r2459 47 47 #include <Ogre.h> 48 48 #include <CEGUI.h> 49 #include "ois/OIS.h"50 49 #include <boost/thread/recursive_mutex.hpp> 51 50 //#include <boost/thread/mutex.hpp> … … 53 52 //#include <boost/thread/thread.hpp> 54 53 #include <boost/static_assert.hpp> 54 55 #include "BulletDynamics/Dynamics/btRigidBody.h" 56 #include "ois/OIS.h" 55 57 #include "tinyxml/ticpp.h" 56 58 #include "tinyxml/tinyxml.h" … … 97 99 #include "network/synchronisable/Synchronisable.h" 98 100 99 #include "Settings.h"101 //#include "Settings.h" 100 102 101 103 //#endif /* ifdef NDEBUG */ 102 104 103 #endif /* ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH) */105 #endif /* defined(ORXONOX_ENABLE_PCH) */ 104 106 105 107 #endif /* _OrxonoxStableHeaders_H__ */
Note: See TracChangeset
for help on using the changeset viewer.