47acf4ee9a
Conflicts: kwin/scripting/scripting.cpp powerdevil/daemon/actions/bundled/powerdevildimdisplayaction.desktop solid-actions-kcm/device-actions/solid-device-SerialInterface.desktop |
||
---|---|---|
.. | ||
kwincompositing | ||
kwindecoration | ||
kwindesktop | ||
kwinoptions | ||
kwinrules | ||
kwinscreenedges | ||
kwinscripts | ||
kwintabbox | ||
CMakeLists.txt |