l10n daemon script 2e9dc7f28a 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 12:07:39 +00:00
..
common	Fix the build	2016-10-04 17:21:51 +02:00
standalone	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-24 12:07:39 +00:00
windowed
CMakeLists.txt