kwin/plugins
l10n daemon script 3eaf1a9972 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-07-22 07:44:41 +02:00
..
idletime
kdecorations SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:51:12 +02:00
kglobalaccel
platforms SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-22 07:44:41 +02:00
qpa Fix the build on armhf/aarch64 2018-03-06 09:25:33 +05:30
scenes SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-22 07:44:41 +02:00
CMakeLists.txt