diff options
author | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:02:43 +0000 |
---|---|---|
committer | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:02:43 +0000 |
commit | 601ebdf6c4faea76016cf0d87d50abc260ca1569 (patch) | |
tree | cf601630c933447f2a369f6245f9a04b9a46b08a /src/application.h | |
parent | Typographical and grammar corrections (diff) | |
parent | EBN Krazy fixes. 1st round.. (diff) | |
download | rekonq-601ebdf6c4faea76016cf0d87d50abc260ca1569.tar.xz |
Fixing conflicts merging master
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964593 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/application.h')
-rw-r--r-- | src/application.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/application.h b/src/application.h index 61f4af81..e0c7a21c 100644 --- a/src/application.h +++ b/src/application.h @@ -23,9 +23,6 @@ #ifndef APPLICATION_H #define APPLICATION_H -// Qt Includes -#include <QPointer> - // KDE Includes #include <KUniqueApplication> #include <KCmdLineArgs> @@ -35,6 +32,8 @@ #include <kio/job.h> #include <kio/jobclasses.h> +// Qt Includes +#include <QPointer> // Forward Declarations class KIcon; |