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 4101e4ad17 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-14 02:32:23 +00:00
..
package/contents/ui kcms: Move KCMs from plasma-settings 2023-03-13 18:45:47 -07:00
clockconfig_actions.actions SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-14 02:32:23 +00:00
CMakeLists.txt kcms: Ensure reuse headers exist 2023-03-13 19:09:23 -07:00
config.h.cmake kcms: Move KCMs from plasma-settings 2023-03-13 18:45:47 -07: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: Move KCMs from plasma-settings 2023-03-13 18:45:47 -07:00
timesettings.h kcms: Move KCMs from plasma-settings 2023-03-13 18:45:47 -07:00
timesettings.json SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-14 02:32:23 +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