]> cloud.milkyroute.net Git - dolphin.git/commit
Merge branch 'master' into frameworks
authorEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Thu, 19 Feb 2015 19:34:35 +0000 (20:34 +0100)
committerEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Thu, 19 Feb 2015 19:34:35 +0000 (20:34 +0100)
commit8679115552ec65ccfc6cbc1db68414d80e3a081b
tree0d458ead5d254932fa5707ec8ca74cd2a5dd1ecc
parent9221362ceaf695b02b316f88cbf27e1ba96c89db
parent1ef5434572d0289a160589395b8b80cd800bc195
Merge branch 'master' into frameworks
src/dolphin.appdata.xml
src/panels/places/placesitemmodel.cpp
src/panels/places/placesitemmodel.h
src/panels/places/placespanel.cpp
src/settings/kcm/kcmdolphingeneral.desktop
src/settings/kcm/kcmdolphinnavigation.desktop
src/settings/kcm/kcmdolphinservices.desktop
src/settings/kcm/kcmdolphinviewmodes.desktop