summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-07-22 01:00:40 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-07-22 01:00:40 +0200
commitbbab050a3b1c6a631aed8fdf5b0ab484378e0cef (patch)
tree10798d78258216ebdfabc8ba6c04b8034dc9dd4e /AUTHORS
parentMerge commit 'refs/merge-requests/152' of git://gitorious.org/rekonq/mainline (diff)
parentfix suggestion type (diff)
downloadrekonq-bbab050a3b1c6a631aed8fdf5b0ab484378e0cef.tar.xz
Merge commit 'refs/merge-requests/153' of git://gitorious.org/rekonq/mainline into m153
Conflicts: src/history/historymanager.cpp src/history/historymanager.h
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions