l10n daemon script 2bb025cbdb 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-11-02 05:41:14 +01:00
..
desktopchangeosd
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-02 05:41:14 +01:00
synchronizeskipswitcher
videowall
CMakeLists.txt	[scripting] Provide conversion functions for AbstractClient	2019-10-25 17:39:45 +03:00
Messages.sh