l10n daemon script ec2204fbe1 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-01-29 09:28:27 +01:00
..
desktopchangeosd	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-29 09:28:27 +01:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-04 06:12:32 +01:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:01:14 +02:00
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:01:14 +02:00
CMakeLists.txt	[scripting] Provide conversion functions for AbstractClient	2019-10-25 17:39:45 +03:00
Messages.sh