l10n daemon script 2ec0a35fc1 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"		2021-07-19 01:14:02 +00:00
..
CMakeLists.txt	Fix plasmoidheading.svgz being installed to the wrong place	2020-10-01 17:28:54 -06:00
colors	Update breeze-dark/breeze-light colors	2021-01-28 16:22:33 +00:00
metadata.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-07-19 01:14:02 +00:00