l10n daemon script f2cedc32b6 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-08-15 02:14:27 +00:00
..
ui	kcms/info: Move footer actions to header	2023-07-25 18:44:56 +00:00
CMakeLists.txt	Port to kcmutils_add_qml_module	2023-05-06 12:13:12 +02:00
distroinfo.cpp	kcms: Move KCMs from plasma-settings	2023-03-13 18:45:47 -07:00
distroinfo.h	kcms: Move KCMs from plasma-settings	2023-03-13 18:45:47 -07:00
hardwareinfo.cpp	kcms: Move KCMs from plasma-settings	2023-03-13 18:45:47 -07:00
hardwareinfo.h	kcms: Move KCMs from plasma-settings	2023-03-13 18:45:47 -07:00
info.cpp	Remove unneeded QVariantList from KCM constructor args	2023-06-10 10:50:37 +02:00
info.h	Remove unneeded QVariantList from KCM constructor args	2023-06-10 10:50:37 +02:00
kcm_mobile_info.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-08-15 02:14:27 +00:00
Messages.sh	kcms: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00
softwareinfo.cpp	kcms: Move KCMs from plasma-settings	2023-03-13 18:45:47 -07:00
softwareinfo.h	kcms: Move KCMs from plasma-settings	2023-03-13 18:45:47 -07:00