l10n daemon script edb2654228 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"		2017-12-22 05:11:16 +01:00
..
desktopchangeosd
enforcedeco	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-10 04:29:59 +02:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-25 04:33:13 +02:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-22 05:11:16 +01:00
videowall
CMakeLists.txt
Messages.sh