summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-11-18 11:27:03 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-11-18 11:27:03 +0100
commita8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7 (patch)
tree0a0b35dc4661e4dc2c35e629b4f15f76e4e8b6bc /ChangeLog
parentMerge commit 'refs/merge-requests/2106' of git://gitorious.org/rekonq/mainlin... (diff)
parentKIO download system (diff)
downloadrekonq-a8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7.tar.xz
FIxing conflicts
Merge branch 'rekonq04' into dev04try Conflicts: src/CMakeLists.txt
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions