l10n daemon script f6724de704 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"		2016-02-14 09:18:22 +00:00
..
declarativeplugin	Prevent detaching temporary objects	2015-09-12 09:53:05 +02:00
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-14 09:18:22 +00: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