l10n daemon script 0b8453c62f 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"		2018-09-29 08:22:49 +02:00
..
package
CMakeLists.txt