Changeset 9667 for code/trunk/src/orxonox/overlays/OrxonoxOverlay.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/overlays/OrxonoxOverlay.h
r8706 r9667 42 42 #include "util/OgreForwardRefs.h" 43 43 #include "core/BaseObject.h" 44 #include "core/Super.h"45 44 #include "core/WindowEventListener.h" 45 #include "core/class/Super.h" 46 46 47 47 namespace orxonox … … 87 87 88 88 public: 89 OrxonoxOverlay( BaseObject* creator);89 OrxonoxOverlay(Context* context); 90 90 virtual ~OrxonoxOverlay(); 91 91
Note: See TracChangeset
for help on using the changeset viewer.