kwin/src/scripts
l10n daemon script 5317ca9da0 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"
2021-07-27 01:25:25 +00:00
..
desktopchangeosd SVN_SILENT made messages (.desktop file) - always resolve ours 2021-07-27 01:25:25 +00:00
minimizeall SVN_SILENT made messages (.desktop file) - always resolve ours 2021-07-27 01:25:25 +00:00
synchronizeskipswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 2021-07-27 01:25:25 +00:00
videowall SVN_SILENT made messages (.desktop file) - always resolve ours 2021-07-27 01:25:25 +00:00
CMakeLists.txt
Messages.sh