l10n daemon script 7554e8c409 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-10-02 05:24:26 +02:00
..
default	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-02 05:24:26 +02:00
org.kde.latte.plasma	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-02 05:24:26 +02:00
CMakeLists.txt	move Unity indicator out of codepage	2019-03-29 00:07:35 +02:00
Messages.sh	simplify indicators names	2019-03-24 18:44:27 +02:00