l10n daemon script 839293f987 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"		2021-10-24 01:16:44 +00:00
..
colord-integration	plugins: Port away from deprecated version checks	2021-06-07 15:01:19 +00:00
idletime	Fix build	2021-10-19 12:56:58 +03:00
kdecorations	Port to new KDecoration2::DecorationThemeProvider class	2021-09-17 12:45:47 +00:00
kglobalaccel
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-10-24 01:16:44 +00:00
krunner-integration	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-10-24 01:16:44 +00:00
nightcolor	plugins/nightcolor: Remove unused options	2021-10-12 06:38:23 +00:00
platforms	platforms/drm: Fix a typo in DrmCrtc::setLegacyCursor()	2021-10-23 16:56:20 +00:00
qpa	qpa: Fix EGL config selection	2021-09-16 00:37:19 +02:00
scenes	Rename PlatformSurfaceTexture to SurfaceTexture	2021-10-21 10:21:56 +03:00
screencast	Add other missing includes to fix bsd build	2021-10-19 06:18:27 +03:00
windowsystem	effects: Link builtin effects with executables	2021-10-19 09:12:15 +00:00
CMakeLists.txt