l10n daemon script 79c177f94c 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"		2017-09-12 04:55:15 +02:00
..
activities	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-07-30 04:56:37 +02:00
clock	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-07-30 04:56:37 +02:00
notifications	hide fake notifications	2017-09-04 18:25:22 +02:00
quicksettings	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-12 04:55:15 +02:00
CMakeLists.txt	Revert "remove quicksettings applet"	2017-08-30 18:52:43 +02:00