l10n daemon script faa06ea919 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"		2020-10-12 06:06:51 +02:00
..
desktopchangeosd	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-12 06:06:51 +02:00
videowall	Drop empty X-KDE-PluginInfo-Depends	2020-09-01 09:11:48 +00:00
CMakeLists.txt	[scripts/videowall] Reenable the config dialog	2020-07-09 09:47:08 +00:00
Messages.sh