Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9869 in orxonox.OLD for trunk/src/lib/gui/gl/glgui_box.h


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/glgui_box.h

    r9656 r9869  
    1919  class GLGuiBox : public GLGuiContainer
    2020  {
    21 
     21    ObjectListDeclaration(GLGuiBox);
    2222  public:
    2323    GLGuiBox(OrxGui::Orientation orientation = OrxGui::Vertical);
Note: See TracChangeset for help on using the changeset viewer.