]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f27250b dc37893)
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)
Conflicts:
dolphin/src/dolphinmainwindow.cpp


Trivial merge