Merge remote-tracking branch 'origin/KDE/4.10' into master

Browse source

Conflicts:
	CMakeLists.txt
	kcontrol/style/kcmstyle.cpp
	kwin/effects/boxswitch/boxswitch.desktop
	kwin/effects/slideback/slideback.desktop
	kwin/kcmkwin/kwinoptions/kwinactions.desktop
	kwin/kwin.notifyrc
	libs/solid/control/backends/fakenet/solid_fakenet.desktop
	libs/solid/control/solidmodemmanager.desktop
	libs/solid/control/solidnetworkmanager.desktop
	libs/solid/control/solidremotecontrolmanager.desktop
	plasma/generic/applets/batterymonitor/metadata.desktop
	plasma/generic/applets/lock_logout/metadata.desktop
	plasma/generic/applets/notifications/contents/ui/LastNotificationPopup.qml
	plasma/generic/scriptengines/google_gadgets/plasma-packagestructure-googlegadgets.desktop
	plasma/generic/scriptengines/google_gadgets/plasma-scriptengine-googlegadgets.desktop
	solid/kcm/kcm_solid.desktop
	solid/modemmanager-0.4/solid_modemmanager04.desktop
	solid/networkmanager-0.7/solid_networkmanager07.desktop
	solid/networkmanager_fake-0.9/solid_networkmanager09_fake.desktop
	solid/wicd/solid_wicd.desktop

...

This commit is contained in:

Oliver Henshaw 2013-05-20 12:52:55 +01:00

parent 8a637e87fd d2c32dc36e

commit 2a726bb289

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