shift-shell/kcms/time
l10n daemon script 68b94f31b3 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-03-21 02:44:34 +00:00
..
package/contents/ui kcms/time: fix wrong reference 2023-03-15 14:23:19 +01:00
clockconfig_actions.actions SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-21 02:44:34 +00:00
CMakeLists.txt kcms: port to new KCMUtils KCM classes 2023-03-19 17:15:25 +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 2023-03-21 02:44:34 +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: port to new KCMUtils KCM classes 2023-03-19 17:15:25 +00:00
timesettings.h kcms: port to new KCMUtils KCM classes 2023-03-19 17:15:25 +00: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