Changeset 7608 in orxonox.OLD for branches/qt_gui/src/lib/shell

Timestamp:

May 12, 2006, 10:43:53 AM (19 years ago)

Author:

bensch

Message:

merged the old qt-gui back with
svn merge -r7438:HEAD ​https://svn.orxonox.net/orxonox/branches/qt_gui_old .
minor conflict in BuildLibs.am

File:

• branches/qt_gui/src/lib/shell/shell_buffer.h (modified) (1 diff)

branches/qt_gui/src/lib/shell/shell_buffer.h

@@ -10 +10 @@
 #include <stdarg.h>
 #include <list>
-#include "threading.h"
+#include "lib/util/threading.h"
 
 #define      SHELL_BUFFER_SIZE       16384         //!< The Size of the input-buffers (should be large enough to carry any kind of input)