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 | ||
| cube.cpp | ||
| cube.desktop | ||
| cube.h | ||
| cube_config.cpp | ||
| cube_config.desktop | ||
| cube_config.h | ||
| cube_config.ui | ||
| cube_inside.h | ||
| cube_proxy.cpp | ||
| cube_proxy.h | ||
| cubeslide.cpp | ||
| cubeslide.desktop | ||
| cubeslide.h | ||
| cubeslide_config.cpp | ||
| cubeslide_config.desktop | ||
| cubeslide_config.h | ||
| cubeslide_config.ui | ||