l10n daemon script d953d7bf98 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-06-18 05:45:10 +02:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:45:10 +02:00
plugin	Tasks:introduce Tasks.Dialog	2020-04-28 13:12:48 +03:00
CMakeLists.txt	Tasks:introduce Tasks.Dialog	2020-04-28 13:12:48 +03:00
Messages.sh	use kde translations infrastructure	2017-09-08 12:02:52 +03:00
metadata.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:45:10 +02:00