You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script c342be5961 SVN_SILENT made messages (.desktop file) - always resolve ours
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"
9 years ago
..
CMakeLists.txt
Messages.sh
dbuscall.cpp
dbuscall.h
documentation-effect-global.xml
documentation-global.xml
genericscriptedconfig.cpp
genericscriptedconfig.h
genericscriptedconfig.json
kwinscript.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
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