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 |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
presentwindows.cpp | ||
presentwindows.desktop | ||
presentwindows.h | ||
presentwindows_config.cpp | ||
presentwindows_config.desktop | ||
presentwindows_config.h | ||
presentwindows_config.ui | ||
presentwindows_proxy.cpp | ||
presentwindows_proxy.h |