Changeset 2530 for code/branches/bugger/src/orxonox/gamestates

Timestamp:

Dec 23, 2008, 10:40:38 PM (16 years ago)

Author:

rgrieder

Message:

merged revisions 2260 - 2508 from trunk to buggy.
I'm sorry that I have to commit every merge. But otherwise I get tons of conflicts I have to solve ten times over.
Note: did not merge deletion of src/util/testing, tortoise wasn't very friendly with that.

Location:

code/branches/bugger

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSLevel.cc (modified) (1 diff)

code/branches/bugger/src/orxonox/gamestates/GSLevel.cc

@@ -50 +50 @@
 namespace orxonox
 {
-    SetCommandLineArgument(level, "sample3.oxw").shortcut("l");
+    SetCommandLineArgument(level, "presentation_dm.oxw").shortcut("l");
 
     GSLevel::GSLevel()