]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cdebd19 b73aeb4)
Merge branch 'KDE/4.14'
authorEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Thu, 14 Aug 2014 16:28:51 +0000 (18:28 +0200)
committerEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Thu, 14 Aug 2014 16:28:51 +0000 (18:28 +0200)
Conflicts:
dolphin/src/dolphin.appdata.xml


Trivial merge