summaryrefslogtreecommitdiff
path: root/src/bookmarks/bookmarksproxy.h
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-08-20 19:30:26 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-08-20 19:30:26 +0200
commitaa05bd3973a2f39f50c14314840f0fe078f16444 (patch)
treedd21ae094321ca9f0b803379ad7e93a6b065ec10 /src/bookmarks/bookmarksproxy.h
parentbk toolbar by default for the next rekonq. (diff)
parentChange from QByteArray to QString in the right way (diff)
downloadrekonq-aa05bd3973a2f39f50c14314840f0fe078f16444.tar.xz
Merge branch 'opensearch'
Conflicts: src/CMakeLists.txt src/urlbar/urlresolver.cpp
Diffstat (limited to 'src/bookmarks/bookmarksproxy.h')
0 files changed, 0 insertions, 0 deletions