- Timestamp:
- Dec 14, 2008, 4:16:52 PM (15 years ago)
- Location:
- code/branches/physics_merge
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/physics_merge
- Property svn:mergeinfo changed
-
code/branches/physics_merge/src/orxonox/objects/worldentities/Camera.h
- Property svn:mergeinfo changed
/code/branches/physics/src/orxonox/objects/worldentities/Camera.h (added) merged: 2151,2184,2300 /code/trunk/src/orxonox/objects/worldentities/Camera.h (added) merged: 1913-2085
r2420 r2442 33 33 34 34 #include <OgrePrerequisites.h> 35 #include "objects/worldentities/ PositionableEntity.h"35 #include "objects/worldentities/StaticEntity.h" 36 36 #include "objects/Tickable.h" 37 37 38 38 namespace orxonox 39 39 { 40 class _OrxonoxExport Camera : public PositionableEntity, public Tickable40 class _OrxonoxExport Camera : public StaticEntity, public Tickable 41 41 { 42 42 friend class CameraManager; - Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.