l10n daemon script b993b510a4 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"		2024-12-15 01:40:00 +00:00
..
ui	kcms/time: Modernize and cleanup code	2024-11-15 09:53:51 -08:00
clockconfig_actions.actions	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-12-15 01:40:00 +00:00
CMakeLists.txt
config.h.cmake
kcm_mobile_time.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-12-15 01:40:00 +00:00
Messages.sh
timedated1.xml
timesettings.cpp	kcms/time: Modernize and cleanup code	2024-11-15 09:53:51 -08:00
timesettings.h	kcms/time: Modernize and cleanup code	2024-11-15 09:53:51 -08:00
timezonedata.h
timezonemodel.cpp	kcms/time: Don't insert "local" option into timezones dropdown	2024-10-09 19:43:48 -07:00
timezonemodel.h
timezonesi18n.cpp
timezonesi18n.h