l10n daemon script 6fae26cc25 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-24 14:28:34 +01:00
..
scripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-24 14:28:34 +01:00
windowswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-24 14:28:34 +01:00
CMakeLists.txt