l10n daemon script 1d6de6a3a9 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"		2022-01-01 01:43:48 +00:00
..
desktopchangeosd	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-31 01:42:54 +00:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-31 01:42:54 +00:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-01-01 01:43:48 +00:00
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-31 01:42:54 +00:00
CMakeLists.txt
Messages.sh