Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 27, 2005, 7:14:55 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -r 4301:HEAD trunk/ branches/physics/
little conflict in particle-system resolved easily

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/physics/src/lib/graphics/text_engine.cc

    r3953 r4332  
    5151Text::Text(Font* font, int type)
    5252{
    53   this->setClassName("Text");
     53  this->setClassID(CL_TEXT, "Text");
    5454
    5555  // initialize this Text
     
    802802TextEngine::TextEngine ()
    803803{
    804    this->setClassName ("TextEngine");
     804   this->setClassID(CL_TEXT_ENGINE, "TextEngine");
    805805   this->enableFonts();
    806806
Note: See TracChangeset for help on using the changeset viewer.