Changeset 3399 in orxonox.OLD for orxonox/branches/nico/src/null_parent.h

Timestamp:

Feb 6, 2005, 11:27:25 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/nico: merged trunk into branches/nico
merged with command:
svn merge ../trunk/ nico/ -r 3238:HEAD
resolved conflict in favor of branches/nico.

Location:

orxonox/branches/nico

Files:

• . (modified) (1 prop)
• src/null_parent.h (copied) (copied from orxonox/trunk/src/null_parent.h)