summaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-10-21 11:38:46 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-10-21 11:38:46 +0200
commit719cda157b81fcebdeb35a9c5d8c075e112c4e40 (patch)
treeb751ae1b465e6fc945af09cda5ab383ba72403f0 /src/CMakeLists.txt
parentMe stupid.. fixing tab previews! (diff)
parentfix button (diff)
downloadrekonq-719cda157b81fcebdeb35a9c5d8c075e112c4e40.tar.xz
Fixing merge due to recent changes in master
Merge commit 'refs/merge-requests/1836' of git://gitorious.org/rekonq/mainline into NewHomePageSytle Conflicts: src/homepage.cpp
Diffstat (limited to 'src/CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions