l10n daemon script 866dfb4e89 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-01-14 07:04:00 +01:00
..
drm	platformsupport: Set PUBLIC include directories	2021-01-07 09:49:26 +00:00
fbdev	platformsupport: Set PUBLIC include directories	2021-01-07 09:49:26 +00:00
virtual	platformsupport: Set PUBLIC include directories	2021-01-07 09:49:26 +00:00
wayland	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
x11	platforms/x11: Always set swap interval to 1	2021-01-07 13:10:59 +00:00
CMakeLists.txt	Drop hwcomposer backend	2021-01-05 17:38:36 +00:00