]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a7d9b6 f923bda)
Merge branch 'master' into frameworks
authorEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Wed, 25 Feb 2015 20:55:46 +0000 (21:55 +0100)
committerEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Wed, 25 Feb 2015 20:55:46 +0000 (21:55 +0100)
1  2 
src/dolphin.appdata.xml patch | diff1 | diff2 | blob | history
src/panels/places/placesitemmodel.cpp patch | diff1 | diff2 | blob | history

diff --cc src/dolphin.appdata.xml
Simple merge
diff --cc src/panels/places/placesitemmodel.cpp
Simple merge