summaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authorArno <am@disconnect.de>2013-07-19 14:13:15 +0200
committerArno <am@disconnect.de>2013-07-19 14:13:15 +0200
commit333fcd118f601efa36a272f4e6a0f4525a3a0626 (patch)
treee30745fe3b8e4eb33e49ae26f0fada6ced8dd4a7 /main.cpp
parentfd65ae2d1eb8d601108aa845cfd64654af897a2a (diff)
parent99a05672a62b406178630aa87bf675b2fda3be76 (diff)
downloadSheMov-333fcd118f601efa36a272f4e6a0f4525a3a0626.tar.gz
SheMov-333fcd118f601efa36a272f4e6a0f4525a3a0626.tar.bz2
SheMov-333fcd118f601efa36a272f4e6a0f4525a3a0626.zip
Merge ssh://192.168.222.14/home/amoeller/devel/SheMov into archive_view
Conflicts: shemov.cpp shemov.h
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/main.cpp b/main.cpp
index 444b6c1..6f615bb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,7 +5,7 @@
2 of the License, or (at your option) any later version.
*/
-#include <QtWidgets/QApplication>
+#include <QApplication>
#include "shemov.h"