Changeset 3280 for code/trunk/src/core/CorePrereqs.h

Timestamp:

Jul 12, 2009, 11:58:01 PM (16 years ago)

Author:

rgrieder

Message:

Merged most of the core4 revisions back to the trunk except for:

• orxonox_cast
• all the radical changes in the input library

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/CorePrereqs.h (modified) (2 diffs)

code/trunk/src/core/CorePrereqs.h

@@ -74 +74 @@
     namespace KeybindMode
     {
-        enum Enum
+        enum Value
         {
             OnPress,
@@ -165 +165 @@
     // game states
     class Game;
+    struct GameStateConstrParams;
     class GameState;
     struct GameStateTreeNode;