Merge branch 'KDE/4.11'

Browse source

Conflicts:
	kwin/atoms.cpp
	kwin/atoms.h
	kwin/toplevel.cpp
	kwin/toplevel.h

...

This commit is contained in:

Martin Gräßlin 2014-01-28 09:47:53 +01:00

parent 5b07d4c2a1 882d55f1b5

commit fc9b7442da

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