Merge branch 'Plasma/5.6'
8d7d51e4ef19
Actions

Authored by graesslin on May 12 2016, 2:43 PM.

Description

Merge branch 'Plasma/5.6'

dont_crash_aurorae_destroy_deco.cpp is adjusted to Platform.

Committed

graesslin

May 12 2016, 2:43 PM

Parents

Branches

Unknown

Tags

Unknown

Commit		Author	Details	Committed
6cd0d5a54acf	D1586	graesslin	Delay maximize button click to next event cycle	May 11 2016
440cefff9271		jriddell	Update version number for 5.6.4 GIT_SILENT	May 10 2016
33d0f02bf0f0		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 28 2016

				Path	Packages
	M			autotests/wayland/CMakeLists.txt
	A			autotests/wayland/dont_crash_aurorae_destroy_deco.cpp
	M			decorations/decoratedclient.cpp
	M			decorations/decoratedclient.h
	M			plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/main.qml