l10n daemon script 51a302de63 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-05-09 06:29:25 +02:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-05-09 06:29:25 +02:00
plugin	add Containment.ThemeColorsGroup enum	2020-04-24 13:50:08 +03:00
CMakeLists.txt	MAJOR MAJOR:splitting types to their own component	2020-04-23 18:46:24 +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-05-09 06:29:25 +02:00