l10n daemon script 818ed8f4ad 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 05:42:59 +01:00
..
desktopchangeosd
enforcedeco	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 05:42:59 +01:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 05:42:59 +01:00
synchronizeskipswitcher
videowall
CMakeLists.txt
Messages.sh