Merge branch 'Plasma/5.12'
1744801c746b
Actions

Authored by broulik on Jan 16 2018, 4:40 PM.

Description

Merge branch 'Plasma/5.12'

Committed

broulik

Jan 16 2018, 4:40 PM

Parents

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	5551d9be17dd		D9914	broulik	[Folder View] Don't trash local files	Jan 16 2018
	6ae4277121ab		D9891	broulik	[Style KCM] Sync KConfig before announcing change	Jan 16 2018

				Path	Packages
	M			containments/desktop/plugins/folder/foldermodel.cpp
	M			containments/desktop/plugins/folder/foldermodel.h
	M			kcms/style/kcmstyle.cpp