marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
shift-shell/kcms/time
History
l10n daemon script 9f6345c3f3 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-05-08 02:24:47 +00:00
..
ui Port to kcmutils_add_qml_module 2023-05-06 12:13:12 +02:00
clockconfig_actions.actions SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-08 02:24:47 +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-08 02:24: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 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