l10n daemon script db12cb6742 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-06-21 05:35:42 +02:00
..
idletime
kdecorations	Really use the translations. Patch by Victor Ryzhykh <victorr2007@yandex.ru>	2019-05-29 15:16:04 +03:00
kglobalaccel
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-09 05:13:32 +02:00
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-21 05:35:42 +02:00
qpa	[qpa] Don't specify EGL_SURFACE_TYPE when choosing EGLConfig	2019-04-11 07:43:31 -07:00
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-21 05:35:42 +02:00
windowsystem
CMakeLists.txt	Move package structure plugins to plugins dir	2019-03-11 10:57:13 +02:00