l10n daemon script 54d236df37 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"		2019-03-08 06:00:16 +01:00
..
CMakeLists.txt
showpaint.cpp
showpaint.h
showpaint_config.cpp
showpaint_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-03-08 06:00:16 +01:00
showpaint_config.h
showpaint_config.ui