summaryrefslogtreecommitdiffstats
path: root/classes/.gitkeep
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-06-24 17:53:33 +0200
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-06-24 17:54:18 +0200
commit79473c2e7789d4887a449abad46732ed2b17f33d (patch)
tree96fb8ad57a15c96347da141d5bdaa9ee21f6ebb5 /classes/.gitkeep
parentcb5b0b199ec113591b17ca7b6bcb8dbd941b0876 (diff)
parentc38d4a7ae95dd28cf2984787f703d4cc9f1b83b1 (diff)
Merge the agl-compositor sandbox into master
The changes prepared by Marius for agl-compositor have been reviewed in the sandbox/mvlad/agl-compositor. This is the merge to master. Notes: - weston+ivi-shell+windowmanager are replaced using agl-compositor - applications have been adapted accordingly - CI will likely fail as we need to merge all related patches * gerrit/sandbox/mvlad/agl-compositor: Make the agl-compositor the default compositor recipes-demo-hmi: Remove qtaglextras and *-windowmanager depends packagegroup-agl-demo-platform: Remove qtaglextras dependency packagegroup-hmi-framework: Remove *-windowmanager dependency recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb | 6 ++++-- recipes-demo-hmi/dashboard/dashboard_git.bb | 2 +- recipes-demo-hmi/homescreen/homescreen_git.bb | 6 ++++-- recipes-demo-hmi/hvac/hvac_git.bb | 5 +++-- recipes-demo-hmi/launcher/launcher_git.bb | 5 ++++- recipes-demo-hmi/mediaplayer/mediaplayer_git.bb | 1 - recipes-demo-hmi/messaging/messaging_git.bb | 1 - recipes-demo-hmi/mixer/mixer_git.bb | 1 - recipes-demo-hmi/navigation/navigation-demo_git.bb | 1 - recipes-demo-hmi/navigation/ondemandnavi_git.bb | 2 -- recipes-demo-hmi/navigation/poiapp_git.bb | 2 +- recipes-demo-hmi/navigation/tbtnavi_git.bb | 1 - recipes-demo-hmi/onscreenapp/onscreenapp_git.bb | 2 +- recipes-demo-hmi/phone/phone_git.bb | 1 - recipes-demo-hmi/radio/radio_git.bb | 2 +- recipes-demo-hmi/settings/settings_git.bb | 2 +- recipes-demo-hmi/taskmanager/taskmanager_git.bb | 1 - recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb | 4 +--- recipes-platform/packagegroups/packagegroup-hmi-framework.bb | 6 ------ 19 files changed, 21 insertions(+), 30 deletions(-) Change-Id: I2942a82beee36f283817ae566ec44b5f3219411f Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'classes/.gitkeep')
0 files changed, 0 insertions, 0 deletions