Changeset 9667 for code/trunk/src/orxonox/CameraManager.h

Timestamp:

Aug 25, 2013, 9:08:42 PM (12 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/CameraManager.h (modified) (1 diff)

code/trunk/src/orxonox/CameraManager.h

@@ -41 +41 @@
 #include "util/OgreForwardRefs.h"
 #include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport CameraManager : public Singleton<CameraManager>, public OrxonoxClass
+    class _OrxonoxExport CameraManager : public Singleton<CameraManager>
     {
             friend class Singleton<CameraManager>;