kwin/plugins
l10n daemon script 9265d9fae7 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-06-23 04:36:21 +02:00
..
idletime [wayland] Fix heap-use-after-free in idle time plugin 2016-02-02 12:00:12 +01:00
kdecorations SVN_SILENT made messages (.desktop file) - always resolve ours 2017-06-23 04:36:21 +02:00
kglobalaccel [globalaccel] Ensure we don't call into deleted InputRedirection on shutdown 2015-10-05 14:47:15 +02:00
platforms [platforms/drm] Make Atomic Mode Setting the new default 2017-06-12 01:26:16 +02:00
qpa Merge branch 'scaling' 2017-04-29 14:11:13 +01:00
CMakeLists.txt Move clients/ to plugins/kdecorations/ 2016-04-15 15:21:03 +02:00