]> cloud.milkyroute.net Git - dolphin.git/commit
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)
commit4b758c386fb3957160af334230bacd96ed810d2c
tree97afbcc16d11b23d5a552f2f7fffa17817616852
parentcdebd199251bbdf2826bcc65fe0483420d4a6784
parentb73aeb4598503ee7b4eb11f38edd26783d20bbb6
Merge branch 'KDE/4.14'

Conflicts:
dolphin/src/dolphin.appdata.xml