l10n daemon script a1a6341158 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"		2017-01-25 07:33:24 +01:00
..
scripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-25 07:33:24 +01:00
windowswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-25 07:33:24 +01:00
CMakeLists.txt