cloud.milkyroute.net Git - dolphin.git/commit

]> cloud.milkyroute.net Git - dolphin.git/commit

projects / dolphin.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 228aadd 9203fdc)

author	Luca Beltrame <lbeltrame@kde.org>
	Sun, 3 Aug 2014 16:49:43 +0000 (18:49 +0200)
committer	Luca Beltrame <lbeltrame@kde.org>
	Sun, 3 Aug 2014 16:49:43 +0000 (18:49 +0200)
commit	df871967c948de1aeb4d635fafd937369121aef0
tree	596ab2bb91a9388d950a204f083ceb546d83a344	tree
parent	228aadd4d99498639d1b09f7cf09812a8071097a	commit \| diff
parent	9203fdc4d9945b391cf0722334934df446938867	commit \| diff

Merge branch 'master' into frameworks

Conflicts:
dolphin/src/panels/places/placesitemmodel.cpp
kdepasswd/kcm/CMakeLists.txt [deleted in frameworks]
kdepasswd/kcm/main.cpp [deleted in frameworks]