- Timestamp:
- Jun 20, 2009, 9:20:47 AM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/orxonox/objects/controllers/ScriptController.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/pch (added) merged: 3114-3118,3124-3125,3127-3131,3133,3138-3194
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/controllers/ScriptController.h
r2662 r3196 31 31 32 32 #include "OrxonoxPrereqs.h" 33 34 33 #include "ArtificialController.h" 35 34 … … 40 39 public: 41 40 ScriptController(BaseObject* creator); 42 virtual ~ScriptController(); 43 44 protected: 41 virtual ~ScriptController() { } 45 42 46 43 private:
Note: See TracChangeset
for help on using the changeset viewer.
