Skip to content
Snippets Groups Projects
Commit 3a8194ab authored by Mikko Gronoff's avatar Mikko Gronoff
Browse files

Merge remote-tracking branch 'qt/warrior' into zeus

* qt/warrior:
  92d6772c Merge remote-tracking branch 'qt/5.14.1_QtAS' into warrior
  4836e23f boot2qt-demos: update to latest revision
  561de043 ostree: avoid race condition in case tests directory does not exist
  f83f59f2 Update automotive sha1s for QtAS 5.14.1
  93c5d711 [automotive] update sha1 for Neptune 3 UI
  0f295b8a meta-qt5: update layer
  ebcc35ae boot2qt-launcher: update to latest revision
  58dfb705 boundary, freescale-3rdparty: update layers
  7f2639d3 Merge remote-tracking branch 'qt/5.14.1_QtAS' into warrior
  719c7efe Move back to primary toradex git server
  7e50e244 dbus-session: make sure user runtime dir is created in time
  6a33600f meta-qt5: update layer
  0a16af41 poky: update yocto to v2.7.3
  9149850e Update NXP EULA to latest version
  d0327eb8 qtapplicationmanager: update revision
  25fdf1b0 gammaray: update license checksum
  83ab6464 [automotive] update fonts license
  7414c000 Update automotive sha1s for QtAS 5.14.1

Conflicts:
  meta-boot2qt-distro/conf/layer.conf
  meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo.inc
  scripts/manifest.xml

Change-Id: Ie8cf7c4807c7d8ca4be87adf8307a3dac8b332fb
parents 570c75e6 92d6772c
No related branches found
No related tags found
No related merge requests found
Showing
with 361 additions and 265 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment