l10n daemon script 6f224477e7 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-02-17 05:01:18 +01:00
..
declarativeplugin	Get rid of ProcessRunner	2018-01-09 16:33:02 +01:00
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-17 05:01:18 +01:00
CMakeLists.txt	Streamline internal naming (kdeconnect → org.kde.kdeconnect)	2014-08-26 01:37:35 +02:00
Messages.sh	i18n fixes	2014-09-08 03:09:18 +02:00