90365e27d0
Conflicts: khotkeys/data/kde32b1.khotkeys kinfocenter/Modules/opengl/opengl.desktop kwin/tabbox/tests/CMakeLists.txt plasma/generic/applets/system-monitor/plasma-applet-sm_hdd_activity.desktop |
||
---|---|---|
.. | ||
data | ||
CMakeLists.txt | ||
logout.cpp | ||
logout.desktop | ||
logout.h |