]> cloud.milkyroute.net Git - dolphin.git/commit
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)
commit17af97df2487a46a8b35804b7bf70b46c67ecf80
treeb7c0eef479dc175d3fa212f18eebb49fe1793d1d
parent452c8b8ec8b18e62ff4bae0e49e3f5002ae2f301
parenta55199684898960a25aa9afc730120660087cb5f
Merge branch 'KDE/4.8'

Conflicts:
konqueror/settings/kio/proxy.desktop