Changeset 9667 for code/trunk/src/orxonox/worldentities/pawns/SpaceShip.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/worldentities/pawns/SpaceShip.h (modified) (1 diff)

code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -88 +88 @@
     {
         public:
-            SpaceShip(BaseObject* creator);
+            SpaceShip(Context* context);
             virtual ~SpaceShip();