l10n daemon script 0dc7e3fe53 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"		2016-03-10 09:53:33 +00:00
..
desktopchangeosd	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-30 09:40:57 +00:00
enforcedeco	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-10 11:46:53 +00:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-09 10:37:25 +00:00
synchronizeskipswitcher
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-03-10 09:53:33 +00:00
CMakeLists.txt
Messages.sh