l10n daemon script fe430b12e8 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-09-23 05:47:31 +02:00
..
desktopchangeosd
enforcedeco
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-15 06:01:01 +02:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-23 05:47:31 +02:00
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-27 05:52:15 +02:00
CMakeLists.txt
Messages.sh