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

Timestamp:

May 13, 2005, 11:16:33 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the Trunk into the physics Branche again:
merged with command:
svn merge ../trunk physics -r 3953:HEAD
no important conflicts

Location:

orxonox/branches/physics

Files:

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

orxonox/branches/physics

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

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

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

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+