diff options
| author | Domrachev Alexandr <alexandr.domrachev@gmail.com> | 2009-06-20 14:40:50 +0400 |
|---|---|---|
| committer | Domrachev Alexandr <alexandr.domrachev@gmail.com> | 2009-06-20 14:40:50 +0400 |
| commit | b3c0db45efc83bfba6f02f00b769b2870f9c40ba (patch) | |
| tree | 52aa989abe5312c492f5ebb73dba0610751e59e8 /src/CMakeLists.txt | |
| parent | Application::icon() changed to static (diff) | |
| parent | rekonq 0.1.5: UI changes (diff) | |
| download | rekonq-b3c0db45efc83bfba6f02f00b769b2870f9c40ba.tar.xz | |
Merge branch 'master' of git@gitorious.org:~avaddon/rekonq/avaddon-clone.git
* 'master' of git@gitorious.org:~avaddon/rekonq/avaddon-clone.git: (23 commits)
rekonq 0.1.5: UI changes
Various Fixes
RFC. History Menu Revisited.
History Panel Action fix
Removed unuseful history dialog. We use just history panel, from now on..
Removed recently closed tabs history
No more Action Back Menu
UI changes
New Tab tool button
Fixing webpage headers
Restored Unsupport Content Handler (new 1st implementation)
Fix forward declaration
Cosmetic networkmanager changes
SVN_SILENT made messages (.desktop file)
Forgot to remove unuseful KDE IS VERSION check. Removed now..
bookmark toolbar displaying ALL the bookmarks.
fixuifiles
SVN_SILENT made messages (.desktop file)
SVN_SILENT made messages (.desktop file)
SVN_SILENT made messages (.desktop file, second try)
...
Conflicts:
src/mainview.cpp
src/mainwindow.cpp
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 92fd9d53..ed3205b8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,7 +21,6 @@ SET( rekonq_SRCS edittableview.cpp edittreeview.cpp history.cpp - historydialog.cpp historymenu.cpp bookmarks.cpp modelmenu.cpp @@ -44,7 +43,7 @@ SET( rekonq_SRCS KDE4_ADD_UI_FILES( rekonq_SRCS cookies.ui cookiesexceptions.ui - history.ui + #history.ui password.ui proxy.ui settings_general.ui |