Changeset 7034 for code/branches/presentation3/src/orxonox/interfaces

Timestamp:

May 31, 2010, 5:31:50 AM (15 years ago)

Author:

landauf

Message:

merged ai branch to presentation3

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/orxonox/interfaces/PickupCarrier.h (modified) (2 diffs)

code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h

@@ -54 +54 @@
     class InvisiblePickup;
     class MetaPickup;
+    class DronePickup;
     class SpeedPickup;
 
@@ -72 +73 @@
         friend class InvisiblePickup;
         friend class MetaPickup;
+        friend class DronePickup;
         friend class SpeedPickup;