Changeset 8623 in orxonox.OLD for trunk/src/util/game_rules.h

Timestamp:

Jun 20, 2006, 1:39:01 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8230:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
conflicts resolved in favour of the network branche (conflicts were in network)

File:

• trunk/src/util/game_rules.h (modified) (1 diff)

trunk/src/util/game_rules.h

@@ -20 +20 @@
 
 
-class GameRules : public BaseObject
+class GameRules : virtual public BaseObject
 {