l10n daemon script 049b34c050 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-11-14 04:38:05 +01:00
..
drm	[platforms/drm] At safety checks for the properties	2017-11-13 21:19:31 +01:00
fbdev	[platforms/fbdev] Support for RGBA8888 color format	2017-10-23 13:44:53 +05:30
hwcomposer	[platforms/hwcomposer] Set value of surfaceDamage.numRects to 0	2017-11-02 10:21:37 +05:30
virtual	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-14 04:38:05 +01:00
wayland	Add a pure virtual method to Platform to describe the supported compositors	2017-10-18 21:19:43 +02:00
x11	Merge branch 'Plasma/5.11'	2017-11-05 10:46:53 +01:00
CMakeLists.txt	Hide the Linux specific parts behind check for headers	2017-07-24 16:19:27 +02:00