Changeset 3430 in orxonox.OLD for orxonox/branches/trackManager/src/orxonox.cc

Timestamp:

Mar 1, 2005, 9:50:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: merged trunk back to trackManager
merged with command
svn merge -r 3369:HEAD trunk/ branches/trackManager
resoloved conflicts in favor of the trunk.

Location:

orxonox/branches/trackManager

Files:

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

orxonox/branches/trackManager/src/orxonox.cc

@@ -31 +31 @@
 #include "game_loader.h"
 #include <string.h>
+int verbose;
 
 using namespace std;