kwin/scripts
l10n daemon script a5b820ee7e 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-08-27 08:09:08 +02:00
..
desktopchangeosd SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-22 07:44:41 +02:00
enforcedeco SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-22 07:44:41 +02:00
minimizeall SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-15 08:14:58 +02:00
synchronizeskipswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-22 07:44:41 +02:00
videowall SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-27 08:09:08 +02:00
CMakeLists.txt add "MinimizeAll" script 2015-04-07 23:59:17 +02:00
Messages.sh