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 /recipes/python/nativesdk-prebuild-python.inc | |
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 'recipes/python/nativesdk-prebuild-python.inc')
0 files changed, 0 insertions, 0 deletions