shift-shell/applets
l10n daemon script c4e2b393ad 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"
2016-12-13 04:10:48 +01:00
..
activities SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-13 04:10:48 +01:00
clock SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-13 04:10:48 +01:00
notifications SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-13 04:10:48 +01:00
CMakeLists.txt add a very simple activity switcher 2016-09-05 16:05:48 +02:00