Changeset 3365 in orxonox.OLD for orxonox/trunk/src/proto_class.h

Timestamp:

Jan 7, 2005, 1:14:33 AM (21 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/parenting back to the.
merged with command:
svn merge branches/parenting trunk -r 3247:HEAD
resolved all conflicts in favor of parenting.

File:

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

orxonox/trunk/src/proto_class.h

@@ -19 +19 @@
    here can be some longer description of this class
 */
-class ProtoClass {
+class ProtoClass : public BaseObject {
 
  public: