l10n daemon script a80d7a1bea 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"		2023-06-21 02:20:37 +00:00
..
ui	Fix switch identifier	2023-06-19 18:35:01 +02:00
clockconfig_actions.actions	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-06-21 02:20:37 +00:00
CMakeLists.txt	Port to kcmutils_add_qml_module	2023-05-06 12:13:12 +02:00
config.h.cmake	kcms: Move KCMs from plasma-settings	2023-03-13 18:45:47 -07:00
kcm_mobile_time.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-05-23 03:30:47 +00:00
Messages.sh	kcms: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00
timedated1.xml	kcms: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00
timesettings.cpp	Remove unneeded QVariantList from KCM constructor args	2023-06-10 10:50:37 +02:00
timesettings.h	Remove unneeded QVariantList from KCM constructor args	2023-06-10 10:50:37 +02:00
timezonedata.h	kcms: Move KCMs from plasma-settings	2023-03-13 18:45:47 -07:00
timezonemodel.cpp	kcms: Move KCMs from plasma-settings	2023-03-13 18:45:47 -07:00
timezonemodel.h	kcms: Move KCMs from plasma-settings	2023-03-13 18:45:47 -07:00
timezonesi18n.cpp	kcms: Move KCMs from plasma-settings	2023-03-13 18:45:47 -07:00
timezonesi18n.h	kcms: Move KCMs from plasma-settings	2023-03-13 18:45:47 -07:00