l10n daemon script 1f76c005e9 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-09-24 12:33:32 +00:00
..
desktopchangeosd	Adding more frameless hints	2016-08-11 08:45:41 +02:00
enforcedeco	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-24 12:33:32 +00:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-05-31 11:06:54 +00:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-05-31 11:06:54 +00:00
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-05 09:38:26 +00:00
CMakeLists.txt	add "MinimizeAll" script	2015-04-07 23:59:17 +02:00
Messages.sh