summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-05-03 18:57:33 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-05-03 18:57:33 +0200
commit871cb6f8fd2828260a361265c08c595648510b68 (patch)
treefb87b3b2349f712d9db3d08064f943a5beb2ede8 /COPYING
parentQLatin1String -> QL1S (diff)
parentFixed a minor bug in documentation (diff)
downloadrekonq-871cb6f8fd2828260a361265c08c595648510b68.tar.xz
Fix conflicts
Merge commit 'refs/merge-requests/2254' of git://gitorious.org/rekonq/mainline into DocsUpdate Conflicts: docs/index.docbook
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions