Changeset 4338 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

May 27, 2005, 9:16:53 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/physics back to the trunk
merged with command
svn merge -r 3866:HEAD . ../../trunk/
many conflict that i tried to resolv
@patrick: i hope i did not interfere with your stuff :/

File:

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

orxonox/trunk/src/world_entities/camera.h

@@ -19 +19 @@
    This class controls the viewpoint from which the World is rendered.
 */
-class Camera : public PNode 
+class Camera : public PNode
 {
  private: