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

Browse source

Conflicts:
	kwin/layers.cpp [XLib in 4.10 and XCB in master]

...

This commit is contained in:

Luca Beltrame 2013-03-03 17:25:13 +01:00

parent ba99977d98 a9bd8924f8

commit d911cd35d1

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