summaryrefslogtreecommitdiff
path: root/src/history
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-08-20 19:15:23 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-08-20 19:15:23 +0200
commit52bf222bf033f6bbcd15cfe2012a51a194d475d8 (patch)
treed2e839ccbdf38c930d145d4d8dd23897bbc43666 /src/history
parentKrazy fixes, first bunch (diff)
parent- The bookmark toolbar is now a real toolbar, not an action. (diff)
downloadrekonq-52bf222bf033f6bbcd15cfe2012a51a194d475d8.tar.xz
Merge commit 'refs/merge-requests/181' of git://gitorious.org/rekonq/mainline into m181
Conflicts: src/bookmarks/bookmarkstoolbar.h
Diffstat (limited to 'src/history')
0 files changed, 0 insertions, 0 deletions