l10n daemon script f782c1f7ee 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"		2020-10-20 06:33:09 +02:00
..
desktopchangeosd	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-20 06:33:09 +02:00
videowall
CMakeLists.txt
Messages.sh