diff options
author | Yoann Laissus <yoann.laissus@gmail.com> | 2011-05-18 08:32:16 +0200 |
---|---|---|
committer | Yoann Laissus <yoann.laissus@gmail.com> | 2011-05-18 08:32:16 +0200 |
commit | eed882d9f51bafabf31d784abb0d098d3e8097bc (patch) | |
tree | c3efb8f68f071f984a0a9618ddee5fc92b1112d2 /src/bookmarks/bookmarkowner.h | |
parent | Merge branch 'bkFolder' (diff) | |
parent | - Fix bookmark conflict between Rekonq and Konqueror (diff) | |
download | rekonq-eed882d9f51bafabf31d784abb0d098d3e8097bc.tar.xz |
Merge branch 'rekonqKonquerorBkConflict'
Diffstat (limited to 'src/bookmarks/bookmarkowner.h')
0 files changed, 0 insertions, 0 deletions