Changeset 5819 in orxonox.OLD for trunk/src/lib/event/key_mapper.h

Timestamp:

Nov 29, 2005, 11:07:43 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches world_entities to trunk again
merged with command
svn merge -r5795:HEAD branches/world_entities/ trunk/
no conflicts (what a wonder)

File:

• trunk/src/lib/event/key_mapper.h (modified) (1 diff)

trunk/src/lib/event/key_mapper.h

@@ -29 +29 @@
   virtual ~KeyMapper();
 
-  void loadKeyBindings(const char* fileName = DEFAULT_CONFIG_FILE);
+  void loadKeyBindings(const char* fileName = NULL);
   void loadKeyBindings(IniParser* iniParser);