summaryrefslogtreecommitdiff
path: root/src/rekonq_defines.h
diff options
context:
space:
mode:
authorYoann Laissus <yoann.laissus@gmail.com>2011-05-18 08:32:16 +0200
committerYoann Laissus <yoann.laissus@gmail.com>2011-05-18 08:32:16 +0200
commiteed882d9f51bafabf31d784abb0d098d3e8097bc (patch)
treec3efb8f68f071f984a0a9618ddee5fc92b1112d2 /src/rekonq_defines.h
parentMerge branch 'bkFolder' (diff)
parent- Fix bookmark conflict between Rekonq and Konqueror (diff)
downloadrekonq-eed882d9f51bafabf31d784abb0d098d3e8097bc.tar.xz
Merge branch 'rekonqKonquerorBkConflict'
Diffstat (limited to 'src/rekonq_defines.h')
0 files changed, 0 insertions, 0 deletions