l10n daemon script b7bdc75ff9 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"		2020-09-17 06:15:05 +02:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-17 06:15:05 +02:00
CMakeLists.txt	Move declarativeplugin to top-level dir	2018-08-03 02:24:58 +02:00
Messages.sh	i18n fixes	2014-09-08 03:09:18 +02:00