l10n daemon script f0e1d4e46e 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"		2022-04-16 01:47:42 +00:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-16 01:47:42 +00:00
CMakeLists.txt	quicksettings: Ensure package ids don't conflict with existing applets	2022-03-17 15:57:40 -04:00
flashlightplugin.cpp	quicksettings/flashlight: Move C++ out of ShellUtil into package	2022-03-17 00:07:29 -04:00
flashlightplugin.h	quicksettings/flashlight: Move C++ out of ShellUtil into package	2022-03-17 00:07:29 -04:00
flashlightutil.cpp	quicksettings: Fix flashlight	2022-03-20 14:35:57 -04:00
flashlightutil.h	quicksettings/flashlight: Move C++ out of ShellUtil into package	2022-03-17 00:07:29 -04:00
qmldir	quicksettings/flashlight: Move C++ out of ShellUtil into package	2022-03-17 00:07:29 -04:00