Changeset 9667 for code/trunk/src/orxonox/Scene.h
- Timestamp:
- Aug 25, 2013, 9:08:42 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/Scene.h
r6417 r9667 45 45 namespace orxonox 46 46 { 47 class _OrxonoxExport Scene : public BaseObject, public Synchronisable, public Tickable 47 class _OrxonoxExport Scene : public BaseObject, public Synchronisable, public Tickable, public Context 48 48 { 49 49 public: 50 Scene( BaseObject* creator);50 Scene(Context* context); 51 51 virtual ~Scene(); 52 52
Note: See TracChangeset
for help on using the changeset viewer.