l10n daemon script eedccae16f 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-09-23 07:36:20 +02:00
..
desktopchangeosd
enforcedeco
minimizeall
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-23 07:36:20 +02:00
videowall
CMakeLists.txt
Messages.sh