Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6142 in orxonox.OLD for trunk/src/lib/sound/sound_engine.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/lib/sound/sound_engine.cc

    r6076 r6142  
    141141    if (!this->ALSources.empty())
    142142    {
    143 
    144143      source = this->ALSources.top();
    145       printf("test: : %d\n", source);
    146144      this->ALSources.pop();
    147145    }
Note: See TracChangeset for help on using the changeset viewer.