diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-11-18 11:27:03 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-11-18 11:27:03 +0100 |
| commit | a8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7 (patch) | |
| tree | 0a0b35dc4661e4dc2c35e629b4f15f76e4e8b6bc /src/mainwindow.h | |
| parent | Merge commit 'refs/merge-requests/2106' of git://gitorious.org/rekonq/mainlin... (diff) | |
| parent | KIO download system (diff) | |
| download | rekonq-a8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7.tar.xz | |
FIxing conflicts
Merge branch 'rekonq04' into dev04try
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'src/mainwindow.h')
| -rw-r--r-- | src/mainwindow.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h index af052c1b..64ce6967 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -32,7 +32,6 @@ // Local Includes #include "bookmarks.h" -// #include "mainview.h" #include "webview.h" // KDE Includes |