Merge branch 'KDE/4.11'

Browse source

Conflicts:
	CMakeLists.txt
	plasma/desktop/applets/taskmanager/package/contents/ui/Task.qml
	plasma/generic/wallpapers/image/image.cpp

...

This commit is contained in:

Eike Hein 2013-11-05 21:33:10 +01:00

parent 324aae916a feeb45445b

commit 298fd90eab

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