kwin/plugins
l10n daemon script 90306f5c08 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-01-06 05:42:41 +01:00
..
idletime Build KF5IdleTimeKWinWaylandPrivatePlugin in correct directory 2018-11-09 17:39:29 +01:00
kdecorations SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-22 06:02:11 +01:00
kglobalaccel [autotests] Support new way to run the tests without need to install 2017-11-21 20:34:52 +01:00
platforms [platforms/virtual] Add support for EGL_MESA_platform_surfaceless 2019-01-05 10:48:08 +01:00
qpa Bring FindFontconfig.cmake up to ECM standards 2018-12-18 18:11:11 +01:00
scenes SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-06 05:42:41 +01:00
CMakeLists.txt Move SceneXRender into a plugin 2017-09-01 17:42:28 +02:00