diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-10-16 14:48:41 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-10-16 14:48:41 +0300 |
| commit | fb22822ea452bd990b09d0dc96607dd88c915ee2 (patch) | |
| tree | b668654ca6eaee679057bc4ea0c14c888a6f9ae7 /scripts | |
| parent | 718ef6e06d732543f0d9c991683fc38793489461 (diff) | |
| parent | 1bb77ba7ef3677b39d5ebdcb69ac456cdd50c0f3 (diff) | |
| download | meta-boot2qt-fb22822ea452bd990b09d0dc96607dd88c915ee2.tar.gz | |
Merge remote-tracking branch 'origin/morty' into pyro
* origin/morty:
meta-qt5: update to 5.9.3
apalis-imx6: modify u-boot to provide support for ixora v1.0
apalis-imx6: add support for the new capasitive touch display
toradex: update to 2.7b4 release
Conflicts:
scripts/manifest.xml
Change-Id: Iaeca481a289d0bf431d2b71e03c2b3453f227021
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/manifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index f935e1a..e8e050b 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
| @@ -73,12 +73,12 @@ | |||
| 73 | groups="notdefault,external,renesas-gen3"/> | 73 | groups="notdefault,external,renesas-gen3"/> |
| 74 | <project name="meta-toradex-bsp-common" | 74 | <project name="meta-toradex-bsp-common" |
| 75 | remote="toradex" | 75 | remote="toradex" |
| 76 | revision="b128af95613557af8deaea30212e89e6316eab88" | 76 | revision="429d294f9b271433d4d0130530677dc417e6ec6e" |
| 77 | path="sources/meta-toradex-bsp-common" | 77 | path="sources/meta-toradex-bsp-common" |
| 78 | groups="notdefault,external,toradex"/> | 78 | groups="notdefault,external,toradex"/> |
| 79 | <project name="meta-toradex-nxp" | 79 | <project name="meta-toradex-nxp" |
| 80 | remote="toradex" | 80 | remote="toradex" |
| 81 | revision="89a17628efef01fd5af202e88d79188df08f636f" | 81 | revision="45c33b79a734d016dddb997c1895b53202286f23" |
| 82 | path="sources/meta-toradex-nxp" | 82 | path="sources/meta-toradex-nxp" |
| 83 | groups="notdefault,external,toradex"/> | 83 | groups="notdefault,external,toradex"/> |
| 84 | 84 | ||