Merge branch 'KDE/4.11'

Browse source

Conflicts:
	ksmserver/screenlocker/ksldapp.cpp

...

This commit is contained in:

Martin Gräßlin 2014-01-08 10:26:48 +01:00

parent 59e08896fb 723dce4e4c

commit 6fce4c2b81

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