l10n daemon script 7b23cbc13e 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"		2015-12-14 10:29:43 +00:00
..
desktopchangeosd
enforcedeco
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-14 10:29:43 +00:00
synchronizeskipswitcher
videowall
CMakeLists.txt
Messages.sh