Changeset 1989 for code/branches/objecthierarchy/src/core/Template.h
- Timestamp:
- Oct 21, 2008, 4:56:41 PM (17 years ago)
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
code/branches/objecthierarchy/src/core/Template.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/ceguilua/src/orxonox/objects/Template.h 1802-1808 /code/branches/core3/src/orxonox/objects/Template.h 1572-1739 /code/branches/gcc43/src/orxonox/objects/Template.h 1580 /code/branches/gui/src/orxonox/objects/Template.h 1635-1723 /code/branches/input/src/orxonox/objects/Template.h 1629-1636 /code/branches/script_trigger/src/orxonox/objects/Template.h 1295-1953,1955
r1971 r1989 32 32 #include <map> 33 33 34 #include "OrxonoxPrereqs.h" 35 #include "core/BaseObject.h" 34 #include "CorePrereqs.h" 35 36 #include "BaseObject.h" 36 37 #include "tinyxml/ticpp.h" 37 38 38 39 namespace orxonox 39 40 { 40 class _ OrxonoxExport Template : public BaseObject41 class _CoreExport Template : public BaseObject 41 42 { 42 43 public: … … 45 46 46 47 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 48 virtual void changedName(); 47 49 48 50 inline void setLink(const std::string& link) -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.