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

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:

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

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

@@ -13 +13 @@
                 \
                 glgui_handler.cc \
+                glgui_widget.cc \
                 glgui_mainwidget.cc \
-                glgui_widget.cc \
                 glgui_button.cc \
                 glgui_pushbutton.cc \
@@ -22 +22 @@
                 glgui_bar.cc \
                 glgui_box.cc \
+                glgui_fixedposition_box.cc \
                 glgui_frame.cc \
                 glgui_text.cc \
@@ -40 +41 @@
                 glgui_defs.h \
                 glgui_handler.h \
+                glgui_widget.h \
                 glgui_mainwidget.h \
-                glgui_widget.h \
                 glgui_button.h \
                 glgui_pushbutton.h \
@@ -49 +50 @@
                 glgui_bar.h \
                 glgui_box.h \
+                glgui_fixedposition_box.h \
                 glgui_frame.h \
                 glgui_text.h \