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/mainwindow.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/mainwindow.h')
| -rw-r--r-- | src/mainwindow.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h index 823ab86f..61d8f27b 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -40,6 +40,7 @@ class QWebFrame; class KUrl; class KAction; class KActionMenu; +class KIcon; class KMenu; class FindBar; @@ -150,3 +151,4 @@ private: }; #endif // MAINWINDOW_H + |