Changeset 9347 in orxonox.OLD for branches/proxy/src/lib/coord

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/lib/coord/p_node.h (modified) (2 diffs)

branches/proxy/src/lib/coord/p_node.h

@@ -20 +20 @@
 
 #include "base_object.h"
-#include "stdincl.h"
 #include "synchronizeable.h"
 
@@ -112 +111 @@
   /** @returns the absolute position */
   inline const Vector& getLastAbsCoor () const { return this->lastAbsCoordinate; };
-  
+
   void shiftCoor (const Vector& shift);
   void shiftCoor (float x, float y, float z) { this->shiftCoor(Vector(x, y, z)); };