l10n daemon script a04a134a7a 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"		2021-10-22 01:20:47 +00:00
..
data
CMakeLists.txt	effects: Link builtin effects with executables	2021-10-19 09:12:15 +00:00
main.cpp	effects: Link builtin effects with executables	2021-10-19 09:12:15 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-10-22 01:20:47 +00:00
startupfeedback.cpp	Remove OpenGL2Compositing enum	2021-06-09 15:24:22 +00:00
startupfeedback.h