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

Browse source

You don't need to cherry-pick if you find a conflict in a .desktop file
made by Scripty.

Just use git checkout --ours <path to .desktop file> and then git add
<path to .desktop file>.

Thomas, I picked the versions from master for these conflicts, please
review that I did not mess up anything.

CCMAIL: thomas.luebking@gmail.com

Conflicts:
	kwin/layers.cpp
	kwin/screenedge.cpp
	kwin/workspace.h
	plasma/generic/applets/batterymonitor/metadata.desktop
	plasma/generic/applets/lock_logout/metadata.desktop

...

This commit is contained in:

Luca Beltrame 2013-02-13 07:43:32 +01:00

parent c395d6e66c 0bd6e413b2

commit f0cdfefd1c

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