l10n daemon script 71acd12eb2 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"		2019-02-17 05:37:27 +01:00
..
desktopchangeosd
enforcedeco
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-17 05:37:27 +01:00
synchronizeskipswitcher
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-27 05:52:15 +02:00
CMakeLists.txt	add "MinimizeAll" script	2015-04-07 23:59:17 +02:00
Messages.sh