- Timestamp:
- Nov 12, 2008, 1:44:09 PM (16 years ago)
- Location:
- code/branches/physics
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/physics
- Property svn:mergeinfo changed
/code/branches/physics (added) merged: 1913,1919-1920,1922-1925,1933,1963-1967,1971-1974,1983-1988,1995,2047
- Property svn:mergeinfo changed
-
code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.h
r2087 r2192 32 32 #include "OrxonoxPrereqs.h" 33 33 34 #include " WorldEntity.h"34 #include "MovableEntity.h" 35 35 #include "objects/Tickable.h" 36 36 37 37 namespace orxonox 38 38 { 39 class _OrxonoxExport ControllableEntity : public WorldEntity, public Tickable39 class _OrxonoxExport ControllableEntity : public MovableEntity, public Tickable 40 40 { 41 41 public:
Note: See TracChangeset
for help on using the changeset viewer.