Merge branch 'KDE/4.11'

Browse source

Conflicts:
	kcontrol/desktoppaths/desktoppath.desktop
	kcontrol/desktoptheme/desktoptheme.desktop
	kcontrol/input/cursortheme.desktop
	ksmserver/themes/contour/metadata.desktop
	ksmserver/themes/default/metadata.desktop
	ksplash/kcm/ksplashthememgr.desktop
	kstyles/themes/mega.themerc
	libs/ksysguard/processui/ProcessWidgetUI.ui
	libs/ksysguard/processui/ksysguardprocesslist.cpp
	libs/taskmanager/taskactions.cpp
	plasma/generic/runners/solid/plasma-runner-solid.desktop
	solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop
	solid-actions-kcm/device-actions/solid-device-StorageDrive.desktop

...

This commit is contained in:

Àlex Fiestas 2014-03-21 10:55:43 +01:00

parent 46cb75c33f 974934d3f8

commit 7b14e38132

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available