]> cloud.milkyroute.net Git - dolphin.git/commit
Merge remote branch 'origin/KDE/4.8'
authorAaron Seigo <aseigo@kde.org>
Wed, 21 Dec 2011 16:08:23 +0000 (17:08 +0100)
committerAaron Seigo <aseigo@kde.org>
Wed, 21 Dec 2011 16:08:23 +0000 (17:08 +0100)
commit5e0e05e8f0c82e987cc56a17bdac1718e8feb320
tree7eccc6b7372ac6fe7d973e035abc31088d3f2fa4
parenta8622c7a1ed9b04645eb5a4c72060ea5f08b5364
parent050e094e6b2ecd3c5ff4cc809d4ce3eedc61f3b8
Merge remote branch 'origin/KDE/4.8'

Conflicts:
plasma/applets/folderview/folderview.cpp