Changeset 8194 for code/branches/dockingsystem/src/orxonox/OrxonoxPrereqs.h

Timestamp:

Apr 6, 2011, 12:07:29 PM (14 years ago)

Author:

dafrick

Message:

Merging trunk into dockingsystem branch to be able to use the recent bugfix in MultiTrigger.

Location:

code/branches/dockingsystem

Files:

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

code/branches/dockingsystem/src/orxonox/OrxonoxPrereqs.h

@@ -96 +96 @@
     class Gametype;
     class LastManStanding;
+    class LastTeamStanding;
     class TeamBaseMatch;
     class TeamDeathmatch;