kwin/plugins
l10n daemon script cfd296326b 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"
2019-10-23 05:33:32 +02:00
..
idletime Use nullptr everywhere 2019-09-19 17:48:21 +03:00
kdecorations SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 05:33:32 +02:00
kglobalaccel Use nullptr everywhere 2019-09-19 17:48:21 +03:00
kpackage SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 05:33:32 +02:00
platforms Merge branch 'Plasma/5.17' 2019-10-22 11:29:03 +02:00
qpa Don't use MESA_EGL_NO_X11_HEADERS 2019-10-21 22:18:30 +03:00
scenes [scenes/opengl] Set correct blend mode for EffectQuickView buffers 2019-10-02 20:51:47 +01:00
windowsystem Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00
CMakeLists.txt Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00