Changeset 4283 in orxonox.OLD for orxonox/branches/physics/src/world_entities/player.h

Timestamp:

May 24, 2005, 10:32:34 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to branches/physics
merged with command
svn merge -r 4223:HEAD ../../trunk/ .
conflicts additively included

File:

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

orxonox/branches/physics/src/world_entities/player.h

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