l10n daemon script aad4d58052 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-10-24 09:37:05 +00:00
..
common
standalone	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-24 09:37:05 +00:00
windowed
CMakeLists.txt