l10n daemon script b7ea14d363 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"		2019-09-29 09:19:57 +02:00
..
desktopchangeosd	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-22 07:44:41 +02:00
enforcedeco	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-16 09:09:19 +01:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-29 09:19:57 +02:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-31 09:35:16 +02:00
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-31 09:35:16 +02:00
CMakeLists.txt
Messages.sh