baf21f6b34
Conflicts: plasma/generic/applets/batterymonitor/metadata.desktop plasma/generic/applets/lock_logout/metadata.desktop |
||
|---|---|---|
| .. | ||
| documentation-effect-global.xml | ||
| documentation-global.xml | ||
| kwinscript.desktop | ||
| meta.cpp | ||
| meta.h | ||
| scriptedeffect.cpp | ||
| scriptedeffect.h | ||
| scripting.cpp | ||
| scripting.h | ||
| scriptingutils.cpp | ||
| scriptingutils.h | ||
| timer.cpp | ||
| workspace_wrapper.cpp | ||
| workspace_wrapper.h | ||