Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 3, 2006, 12:19:30 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.h

    r8145 r9869  
    1515class GLMenuImageScreen : public BaseObject
    1616{
    17 
     17  ObjectListDeclaration(GLMenuImageScreen);
    1818public:
    1919  GLMenuImageScreen (const TiXmlElement* root = NULL);
     
    3333  void setMaximum (int maxValue);
    3434  /** @returns the maximum of countable steps*/
    35   inline int GLMenuImageScreen::getMaximum() const { return this->maxValue; };
     35  inline int getMaximum() const { return this->maxValue; };
    3636
    3737  void setValue (int currentValue);
Note: See TracChangeset for help on using the changeset viewer.