Changeset 4194 in orxonox.OLD for orxonox/branches/openAL/src/proto/proto_class.cc

Timestamp:

May 16, 2005, 1:33:19 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/openAL: merged trunk back to openAL
merged with command:

svn merge ../trunk/ openAL/ -r 3920:HEAD

no conflicts at all

Location:

orxonox/branches/openAL

Files:

• . (modified) (1 prop)
• src/proto/proto_class.cc (modified) (3 diffs)

orxonox/branches/openAL

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

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

orxonox/branches/openAL/src/proto/proto_class.cc

@@ -1 @@
-
-
 /* 
    orxonox - the future of 3D-vertical-scrollers
@@ -16 +14 @@
 */
 
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
 #include "proto_class.h"
-
-#include "stdincl.h" // maybe
 
 using namespace std;
@@ -43 +39 @@
   // delete what has to be deleted here
 }
-
-/**
-   \brief nonsense - delete this method
-   \param realy nothing to give
-   \returns true or false - probably nothing?
-
-   this is just to show the doxygen abilities (this for example is an extension for a long comment)
-*/
-bool ProtoClass::doNonSense (int nothing) {}

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