l10n daemon script 0990566c63 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"		2016-05-31 11:06:54 +00:00
..
CMakeLists.txt
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	2016-05-31 11:06:54 +00:00
Messages.sh
meta.cpp
meta.h
screenedgeitem.cpp
screenedgeitem.h
scriptedeffect.cpp	try more aggressively to retarget	2016-02-26 10:28:47 +01:00
scriptedeffect.h	[autotest] Don't crash when cancel animation from animationEnded in scripted effect	2016-02-17 13:59:55 +01:00
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