summaryrefslogtreecommitdiff
path: root/src/sidepanel.cpp
diff options
context:
space:
mode:
authoradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-05-28 10:10:05 +0000
committeradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-05-28 10:10:05 +0000
commitbdb621bd5e76b656585eed1ff154b3dd43d7383c (patch)
tree0ac70cc8977a9afacf23982d983876b999cb796e /src/sidepanel.cpp
parentMerge branch 'master' into local-svn (diff)
parentFixed mainwindow conflicts (diff)
downloadrekonq-bdb621bd5e76b656585eed1ff154b3dd43d7383c.tar.xz
Merge branch 'master' into local-svn
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@973968 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/sidepanel.cpp')
0 files changed, 0 insertions, 0 deletions