l10n daemon script f15e6806f3 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-27 01:22:49 +00:00
..
CMakeLists.txt	effects: Link builtin effects with executables	2021-10-19 09:12:15 +00:00
fallapart.cpp	Fix a few compile warnings	2021-08-13 20:56:45 +02:00
fallapart.h
fallapart.kcfg
fallapartconfig.kcfgc
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-27 01:22:49 +00:00