Merge branch 'KDE/4.11'

Browse Source

Conflicts:
	ksmserver/screenlocker/ksldapp.cpp

remotes/origin/Plasma/5.0

Martin Gräßlin 12 years ago

parent 59e08896fb 723dce4e4c

commit 6fce4c2b81

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available