Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8619 in orxonox.OLD for trunk/src/defs


Ignore:
Timestamp:
Jun 20, 2006, 1:24:11 PM (19 years ago)
Author:
bensch
Message:

trunk: merged the gui-branche back.
merged with command:
svn merge -r8520:HEAD https://svn.orxonox.net/orxonox/branches/gui
no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/defs/class_id.h

    r8518 r8619  
    287287  CL_TEXT                       =    0x00804000,
    288288  CL_MULTI_LINE_TEXT            =    0x00000840,
     289  CL_LIMITED_WIDTH_TEXT         =    0x00000841,
    289290
    290291  // Texutres.
     
    362363  CL_GLGUI_TEXTFIELD            =    0x00000b61,
    363364  CL_GLGUI_IMAGE                =    0x00000b70,
     365  CL_GLGUI_TABLE                =    0x00000b71,
    364366
    365367  CL_GLGUI_NOTIFIER             =    0x00000b80,
Note: See TracChangeset for help on using the changeset viewer.