Merge branch 'KDE/4.9'
4b323220b467
Actions

Authored by rakuco on Jul 25 2012, 5:56 PM.

Description

Merge branch 'KDE/4.9'

KDE/4.9: Fix callback race in the session save and shutdown code. Update for 4.9.0 release SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file) Fix regression in QML shutdown menu. Ampersands should be removed from menu entries' text by default. Fix typos in a message that broke string freeze. Fix potential parallel build failure.

Conflicts:
CMakeLists.txt

Committed

rakuco

Jul 25 2012, 5:56 PM

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
8d9a2b2bbbc2	Script Kiddy	SVN_SILENT made messages (.desktop file)	Jul 25 2012
28be9fb085c3	Script Kiddy	SVN_SILENT made messages (.desktop file)	Jul 24 2012
27292d840cf6	yurchor	Fix typos in a message that broke string freeze.	Jul 24 2012

				Path	Packages
	M			effects/boxswitch/boxswitch.desktop
	M			effects/coverswitch/coverswitch.desktop
	M			effects/flipswitch/flipswitch.desktop
	M			effects/screenshot/screenshot.desktop
	M			kcmkwin/kwincompositing/kwincompositing.desktop
	M			kcmkwin/kwinoptions/kwinadvanced.desktop
	M			kcmkwin/kwinoptions/kwinfocus.desktop
	M			kwin.notifyrc
	M			scripts/desktopchangeosd/metadata.desktop
	M			scripts/synchronizeskipswitcher/metadata.desktop
	M			scripts/videowall/metadata.desktop
	M			tabbox/kwinwindowswitcher.desktop
	M			tabbox/qml/clients/big_icons/metadata.desktop
	M			tabbox/qml/clients/compact/metadata.desktop
	M			tabbox/qml/clients/informative/metadata.desktop
	M			tabbox/qml/clients/present_windows/metadata.desktop
	M			tabbox/qml/clients/small_icons/metadata.desktop
	M			tabbox/qml/clients/text/metadata.desktop
	M			tabbox/qml/clients/thumbnails/metadata.desktop
	M			tabbox/qml/clients/window_strip/metadata.desktop