l10n daemon script 1112188a8b 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-06-10 05:41:19 +02:00
..
desktopchangeosd	Adding more frameless hints	2016-08-11 08:45:41 +02:00
enforcedeco	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-10 05:41:19 +02:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-13 05:52:41 +01:00
synchronizeskipswitcher
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-05 09:38:26 +00:00
CMakeLists.txt
Messages.sh