l10n daemon script 475af42e37 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"		2017-09-27 09:13:10 +02: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	2017-09-27 09:13:10 +02:00
Messages.sh
meta.cpp
meta.h
screenedgeitem.cpp
screenedgeitem.h
scriptedeffect.cpp	Port some displayWidth/displayHeight usages to Screens::size()	2017-09-01 17:11:10 +02:00
scriptedeffect.h	Add support for new touch screen callbacks to KWin scripts and scripted effects	2017-04-07 16:18:09 +02:00
scripting.cpp	Fix two more const / non-const iterator mismatches.	2017-04-07 20:38:19 +02:00
scripting.h	Add support for new touch screen callbacks to KWin scripts and scripted effects	2017-04-07 16:18:09 +02:00
scripting_logging.cpp
scripting_logging.h
scripting_model.cpp
scripting_model.h
scriptingutils.cpp
scriptingutils.h	Add support for new touch screen callbacks to KWin scripts and scripted effects	2017-04-07 16:18:09 +02:00
timer.cpp
workspace_wrapper.cpp	Port some displayWidth/displayHeight usages to Screens::size()	2017-09-01 17:11:10 +02:00
workspace_wrapper.h