l10n daemon script 9c0a71c37f 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-07-13 05:18:09 +02:00
..
desktopchangeosd	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-13 05:18:09 +02:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-17 05:37:27 +01:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-13 05:18:09 +02:00
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-27 05:52:15 +02:00
CMakeLists.txt	[scripts] Drop enforcedeco script	2019-06-29 01:21:42 +03:00
Messages.sh