shift-shell/kcms/time
l10n daemon script 518b94e018 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-06-28 01:25:09 +00:00
..
ui kcms/time: Fix timezone dialog constantly popping up and down the keyboard while typing 2024-03-17 23:26:34 -04:00
clockconfig_actions.actions SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-22 01:21:15 +00:00
CMakeLists.txt kcms: time: Avoid calling waitForFinished 2023-12-30 17:53:34 +00: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 2024-06-28 01:25:09 +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 kcms: time: Avoid calling waitForFinished 2023-12-30 17:53:34 +00:00
timesettings.h kcms: time: Avoid calling waitForFinished 2023-12-30 17:53:34 +00:00
timezonedata.h time-kcm: Port to FormCard 2023-09-21 20:05:48 +02:00
timezonemodel.cpp Fix formatting 2023-09-21 20:06:40 +02:00
timezonemodel.h time-kcm: Port to FormCard 2023-09-21 20:05:48 +02: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