l10n daemon script d9217065fe 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"		2019-04-08 05:46:45 +02:00
..
indicator	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-08 05:46:45 +02:00
CMakeLists.txt	add Latte/Indicator type and improve metadata	2019-03-29 19:12:32 +02:00