l10n daemon script 3dbb47745f 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"		2018-02-08 05:13:52 +01:00
..
desktopchangeosd
enforcedeco	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-01-07 05:00:26 +01:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-08 05:13:52 +01:00
synchronizeskipswitcher
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-01-29 05:06:41 +01:00
CMakeLists.txt
Messages.sh