Thomas Lübking ffaa9d336e Merge branch 'KDE/4.11' ... Conflicts: kcontrol/workspaceoptions/workspaceoptions.desktop kwin/sm.cpp		2014-01-29 20:28:27 +01:00
..
data
CMakeLists.txt
logout.cpp	Merge branch 'KDE/4.11'	2014-01-29 20:28:27 +01:00
logout.desktop
logout.h
logout.kcfg
logoutconfig.kcfgc