Changeset 7661 in orxonox.OLD for trunk/src/lib/gui/qt_gui
- Timestamp:
- May 18, 2006, 12:55:34 AM (19 years ago)
-
orxonox/trunk: merged the QT_GUI back to the trunk
merged with command:
svn merge https://svn.orxonox.net/orxonox/branches/qt_gui . -r7607:HEAD
absolutely no conflicts
- Location:
- trunk/src/lib/gui/qt_gui
- Files:
-
- 17 copied
-
. (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui)
-
Makefile.am (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/Makefile.am)
-
banner.xpm (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/banner.xpm)
-
gui_audio.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_audio.cc)
-
gui_audio.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_audio.h)
-
gui_control.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_control.cc)
-
gui_control.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_control.h)
-
gui_general.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_general.cc)
-
gui_general.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_general.h)
-
gui_video.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_video.cc)
-
gui_video.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_video.h)
-
q_image_widget.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/q_image_widget.cc)
-
q_image_widget.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/q_image_widget.h)
-
qt_gui.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/qt_gui.cc)
-
qt_gui.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/qt_gui.h)
-
qt_gui_elements.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/qt_gui_elements.cc)
-
qt_gui_elements.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/qt_gui_elements.h)
Note: See TracChangeset
for help on using the changeset viewer.
