summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-12-13 17:04:31 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-12-13 17:04:31 +0100
commitf126bc9416cb4769721361354265cadcc742fc8a (patch)
tree9460afb61bd12edc08cd69c8bc43871947c42343 /scripts
parentMerge commit 'refs/merge-requests/67' of git://gitorious.org/rekonq/mainline ... (diff)
parentwalletwidget on top of the webview (not over) (diff)
downloadrekonq-f126bc9416cb4769721361354265cadcc742fc8a.tar.xz
Merge commit 'refs/merge-requests/68' of git://gitorious.org/rekonq/mainline into m68
Conflicts: src/walletwidget.cpp
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions