Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6142 in orxonox.OLD for trunk/src/util/state.cc


Ignore:
Timestamp:
Dec 16, 2005, 7:13:57 PM (18 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/util/state.cc

    r4836 r6142  
    2929const PNode* State::cameraTarget = NULL;
    3030
    31 tList<WorldEntity>* State::worldEntityList = NULL;
     31ObjectManager* State::objectManager = NULL;
    3232
    3333/**
Note: See TracChangeset for help on using the changeset viewer.