Changeset 8619 in orxonox.OLD for trunk/src/lib/gui/gl/glgui.h

Timestamp:

Jun 20, 2006, 1:24:11 PM (18 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:

• trunk/src/lib/gui/gl/glgui.h (modified) (2 diffs)

trunk/src/lib/gui/gl/glgui.h

@@ -16 +16 @@
 #include "glgui_button.h"
 #include "glgui_checkbutton.h"
-//#include "glgui_colorselector.h"
 #include "glgui_pushbutton.h"
 #include "glgui_slider.h"
@@ -22 +21 @@
 #include "glgui_inputline.h"
 #include "glgui_textfield.h"
+#include "glgui_table.h"
 #include "glgui_image.h"