0990566c63
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
dbuscall.cpp | ||
dbuscall.h | ||
documentation-effect-global.xml | ||
documentation-global.xml | ||
genericscriptedconfig.cpp | ||
genericscriptedconfig.h | ||
genericscriptedconfig.json | ||
kwinscript.desktop | ||
Messages.sh | ||
meta.cpp | ||
meta.h | ||
screenedgeitem.cpp | ||
screenedgeitem.h | ||
scriptedeffect.cpp | ||
scriptedeffect.h | ||
scripting.cpp | ||
scripting.h | ||
scripting_logging.cpp | ||
scripting_logging.h | ||
scripting_model.cpp | ||
scripting_model.h | ||
scriptingutils.cpp | ||
scriptingutils.h | ||
timer.cpp | ||
workspace_wrapper.cpp | ||
workspace_wrapper.h |