Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 18, 2005, 11:27:40 AM (19 years ago)
Author:
bensch
Message:

orxonox/branches/movie_player: merged the trunk back into the movie_player
merged with command:
svn merge -r 4014:HEAD ../trunk/ movie_player/
no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/movie_player/src/track_manager.cc

    r3966 r4217  
    396396  this->textAnimation->setInfinity(ANIM_INF_CONSTANT);
    397397}
     398
     399
     400/**
     401   \brief loads a trackElement from a TiXmlElement
     402   \param root the TiXmlElement to load the Data from
     403
     404*/
     405bool TrackManager::load( TiXmlElement* root)
     406{
     407
     408}
     409
     410
    398411
    399412/**
Note: See TracChangeset for help on using the changeset viewer.