Changeset 8619 in orxonox.OLD for trunk/src/lib/gui/gl/Makefile.am

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:

• trunk/src/lib/gui/gl/Makefile.am (modified) (4 diffs)

trunk/src/lib/gui/gl/Makefile.am

@@ -12 +12 @@
                 glmenu/glmenu_imagescreen.cc \
                 \
-                glgui_style.cc \
                 glgui_handler.cc \
                 signal_connector.cc \
@@ -27 +26 @@
                 glgui_inputline.cc \
                 glgui_textfield.cc \
+                glgui_table.cc \
                 glgui_image.cc \
                 glgui_window.cc \
@@ -37 +37 @@
                 glmenu/glmenu_imagescreen.h \
                 \
-                glgui_style.h \
                 signal_connector.h \
                 glgui.h \
@@ -54 +53 @@
                 glgui_inputline.h \
                 glgui_textfield.h \
+                glgui_table.h \
                 glgui_image.h \
                 glgui_window.h \