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

Timestamp:

Mar 30, 2006, 11:45:31 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the preferences back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/preferences . -r7233:HEAD
no conflicts… nice work

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 std::string& fileName = "" );
+  void loadKeyBindings(const std::string& fileName );
+  void loadKeyBindings();
   void loadKeyBindings(IniParser* iniParser);