l10n daemon script b07173232b 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"		2018-10-31 06:11:50 +01:00
..
desktopchangeosd	[desktopchangeosd] Sync desktop switch OSD font size to Plasma OSD font size	2018-10-28 16:46:50 +00:00
enforcedeco	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-31 06:11:50 +01:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-23 05:47:31 +02:00
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-27 05:52:15 +02:00
CMakeLists.txt
Messages.sh