l10n daemon script d143c2d236 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-08-07 08:44:46 +02:00
..
desktopchangeosd	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 08:44:46 +02:00
enforcedeco	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-17 05:37:27 +01:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-04 08:53:00 +02:00
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-31 09:08:12 +02: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