]> cloud.milkyroute.net Git - dolphin.git/commit
Merge remote-tracking branch 'origin/Applications/17.12'
authorLuca Beltrame <lbeltrame@kde.org>
Thu, 18 Jan 2018 08:09:49 +0000 (09:09 +0100)
committerLuca Beltrame <lbeltrame@kde.org>
Thu, 18 Jan 2018 08:09:49 +0000 (09:09 +0100)
commit1a6b3c0a2baba955259d6083c0a3f25dfb44a682
treec2a1dae6bb4a2a55cbb50206498951140e252318
parentdedb612764cfa747ff3ff339323c15cd1fea6925
parent64d2fd29819fa46c293e8c726c7df2ff00b332b3
Merge remote-tracking branch 'origin/Applications/17.12'

Conflicts:
CMakeLists.txt [versions]
src/panels/places/placesitemmodel.cpp
src/kitemviews/kfileitemmodel.cpp
src/panels/folders/folderspanel.h
src/panels/information/informationpanelcontent.cpp
src/panels/places/placesitemmodel.cpp