l10n daemon script e15004ff98 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"		2020-07-28 06:11:46 +02:00
..
drm	drm: prevent cursor buffer leakage	2020-07-27 09:29:11 +00:00
fbdev	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
hwcomposer	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
virtual	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
wayland	screencasting: implement wayland output streaming for egl and wayland backends	2020-07-23 13:14:31 +02:00
x11	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-28 06:11:46 +02:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00