]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 452c8b8 a551996)
Merge branch 'KDE/4.8'
authorMarco Martin <notmart@gmail.com>
Fri, 3 Feb 2012 14:26:27 +0000 (15:26 +0100)
committerMarco Martin <notmart@gmail.com>
Fri, 3 Feb 2012 14:26:27 +0000 (15:26 +0100)
Conflicts:
konqueror/settings/kio/proxy.desktop


Trivial merge