- Timestamp:
- Aug 25, 2013, 9:08:42 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/network/synchronisable/Serialise.h
r8706 r9667 41 41 #include "util/Serialise.h" 42 42 #include "core/CorePrereqs.h" 43 #include "core/CoreIncludes.h"44 #include "core/BaseObject.h" // remove this if circular dependencies in BaseObject/SmartPtr are fixed45 //#include "core/SmartPtr.h"46 43 47 44 namespace orxonox{
Note: See TracChangeset
for help on using the changeset viewer.