]> cloud.milkyroute.net Git - dolphin.git/commit
Merge branch 'KDE/4.14'
authorEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Sun, 31 Aug 2014 15:09:29 +0000 (17:09 +0200)
committerEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Sun, 31 Aug 2014 15:09:29 +0000 (17:09 +0200)
commit773028f270e4820776e1bedccb91a56cd5ec6078
tree418d0dc8532e7edcfa52846564f753e93f1ff8fe
parentf27250bf27a30003a363f4af7adafef13d8abbb7
parentdc378935d3f92c45a48349d08f96cac63411fd50
Merge branch 'KDE/4.14'

Conflicts:
dolphin/src/dolphinmainwindow.cpp