Changeset 1747 for code/trunk/src/core/BaseObject.h
- Timestamp:
- Sep 9, 2008, 4:25:52 AM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core3 (added) merged: 1573-1574,1583-1586,1591-1594,1596-1597,1603,1606-1607,1610-1611,1655,1658,1676-1679,1681-1685,1687,1716-1723,1725-1729,1736
- Property svn:mergeinfo changed
-
code/trunk/src/core/BaseObject.h
r1625 r1747 39 39 #include "CorePrereqs.h" 40 40 41 #include "Super.h" 42 #include "OrxonoxClass.h" 41 43 #include "util/XMLIncludes.h" 42 #include "OrxonoxClass.h"43 44 44 45 namespace orxonox … … 101 102 Namespace* namespace_; 102 103 }; 104 105 SUPER_FUNCTION(0, BaseObject, XMLPort, false); 106 SUPER_FUNCTION(2, BaseObject, changedActivity, false); 107 SUPER_FUNCTION(3, BaseObject, changedVisibility, false); 103 108 } 104 109
Note: See TracChangeset
for help on using the changeset viewer.