l10n daemon script 6f084726a9 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"		2018-01-23 05:07:55 +01:00
..
separator	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-27 04:52:43 +01:00
spacer	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-01-23 05:07:55 +01:00
CMakeLists.txt	fix #572,support latte spacer	2017-07-28 03:09:01 +03:00