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: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00
cellularnetworksettings.cpp	kcms: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00
cellularnetworksettings.h	kcms: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00
cellularnetworksettings.json	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
Messages.sh	kcms: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00
mobileproviders.cpp	kcms: Move KCMs from plasma-settings	2023-03-13 18:45:47 -07:00
mobileproviders.h	kcms: Move KCMs from plasma-settings	2023-03-13 18:45:47 -07:00
modem.cpp	kcms: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00
modem.h	kcms: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00
modemdetails.cpp	kcms: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00
modemdetails.h	kcms: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00
profilesettings.cpp	kcms: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00
profilesettings.h	kcms: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00
sim.cpp	kcms: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00
sim.h	kcms: Ensure reuse headers exist	2023-03-13 19:09:23 -07:00