l10n daemon script aa0f2c88f0 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-01-10 11:46:53 +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-01-10 11:46:53 +00:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-03 11:20:49 +00:00
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-03 11:20:49 +00:00
CMakeLists.txt	add "MinimizeAll" script	2015-04-07 23:59:17 +02:00
Messages.sh	Extract messages from scripts and scripting module	2013-03-04 10:29:25 +01:00