summaryrefslogtreecommitdiff
path: root/src/rekonq_defines.h
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-08-21 01:37:43 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-08-21 01:37:43 +0200
commit5227ba5c53fd1a82fe5d369c2a29b2ad32641f5c (patch)
treeb60cce6a11e0d53c2ad65befae0005bb9747f142 /src/rekonq_defines.h
parentMerge commit 'refs/merge-requests/182' of git://gitorious.org/rekonq/mainline... (diff)
parentUseless include (diff)
downloadrekonq-5227ba5c53fd1a82fe5d369c2a29b2ad32641f5c.tar.xz
Merge commit 'refs/merge-requests/183' of git://gitorious.org/rekonq/mainline into m183
Conflicts: src/mainwindow.h
Diffstat (limited to 'src/rekonq_defines.h')
0 files changed, 0 insertions, 0 deletions