kwin/plugins
l10n daemon script de22fc9ab7 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-11-29 07:51:37 +01:00
..
idletime
kdecorations [autotests] Support new way to run the tests without need to install 2017-11-21 20:34:52 +01:00
kglobalaccel [autotests] Support new way to run the tests without need to install 2017-11-21 20:34:52 +01:00
platforms [autotests] Add tests for DRM platform plugin 2017-11-21 19:27:33 +01:00
qpa Require Qt 5.9 2017-10-31 12:45:21 +01:00
scenes SVN_SILENT made messages (.desktop file) - always resolve ours 2017-11-29 07:51:37 +01:00
CMakeLists.txt