Changeset 9347 in orxonox.OLD for branches/proxy/src/story_entities/game_world_data.h

Timestamp:

Jul 20, 2006, 11:43:27 AM (19 years ago)

Author:

bensch

Message:

orxonox/proxy: merged the proxy.old back again, and it seems to work.

Merged with command
svn merge -r9247:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy.old .

no conflicts

File:

• branches/proxy/src/story_entities/game_world_data.h (modified) (1 diff)

branches/proxy/src/story_entities/game_world_data.h

@@ -42 +42 @@
     void loadGameRule(const TiXmlElement* root);
 
+
   protected:
     virtual ErrorMessage loadGUI(const TiXmlElement* root);