Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6142 in orxonox.OLD for trunk/src/defs


Ignore:
Timestamp:
Dec 16, 2005, 7:13:57 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merge the ObjectManager to the trunk
merged with command:
svn merge -r6082:HEAD objectmanager/ ../trunk/

conflicts resolution was easy this time :)
but specially merged the world to network_world

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/defs/debug.h

    r5996 r6142  
    110110#endif
    111111#ifndef NO_SHELL
    112 #define PRINT_EXEC       printf //ShellBuffer::addBufferLineStatic
     112#define PRINT_EXEC       ShellBuffer::addBufferLineStatic
    113113#else /* NO_SHELL */
    114114#define PRINT_EXEC       printf
Note: See TracChangeset for help on using the changeset viewer.