Changeset 4261 in orxonox.OLD for orxonox/trunk/src/world_entities/player.h

Timestamp:

May 22, 2005, 3:19:57 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the levelLoader-branche back into the trunk, because it seems to be stable.
merged with command:
svn merge -r 4230:HEAD levelLoader ../trunk
no conflicts of any interesst

File:

• orxonox/trunk/src/world_entities/player.h (modified) (1 diff)

orxonox/trunk/src/world_entities/player.h

@@ -22 +22 @@
  public:
   Player();
-  Player(TiXmlElement* root);
+  Player(const TiXmlElement* root);
   virtual ~Player();