l10n daemon script 5b5f17ae2b 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-06-24 04:21:44 +02:00
..
activities	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-20 04:32:58 +02:00
clock	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-24 04:21:44 +02:00
notifications	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-24 04:21:44 +02:00
CMakeLists.txt	add a very simple activity switcher	2016-09-05 16:05:48 +02:00