l10n daemon script 21f246c279 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"		2016-04-21 10:02:53 +00:00
..
common
standalone
windowed
CMakeLists.txt