l10n daemon script 9361fb8610 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-03-15 09:56:33 +00:00
..
desktopchangeosd	SVN_SILENT made messages (.desktop file)	2015-01-15 09:02:26 +00:00
enforcedeco	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-03-15 09:56:33 +00:00
synchronizeskipswitcher
videowall	SVN_SILENT made messages (.desktop file)	2014-11-02 21:49:41 +00:00
CMakeLists.txt
Messages.sh