l10n daemon script 8154ba1cdc 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"		2018-10-31 08:05:22 +01:00
..
desktopchangeosd	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
enforcedeco	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-31 08:05:22 +01:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-23 07:36:20 +02:00
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-27 05:52:15 +02:00
CMakeLists.txt
Messages.sh