kwin/plugins
l10n daemon script b6f22a98a7 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-06-18 07:51:12 +02:00
..
idletime
kdecorations SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:51:12 +02:00
kglobalaccel
platforms Update seat's timestamp after waking up screen through double tap 2018-05-20 15:38:31 +02:00
qpa
scenes SVN_SILENT made messages (.desktop file) - always resolve ours 2018-04-25 07:16:14 +02:00
CMakeLists.txt