l10n daemon script 1ebe7dbb7a 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-12-20 07:06:18 +01: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-12-20 07:06:18 +01:00
notifications	add missing prop pendingRemovals	2017-11-13 15:12:43 +01:00
quicksettings	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-10-24 05:15:41 +02:00
CMakeLists.txt	don't build quicksettings	2017-09-18 12:31:28 +02:00