diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-11-28 15:22:43 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-11-28 15:22:43 +0200 |
| commit | bf596ae52a666425a0e58b3fc9ab2c997d783b88 (patch) | |
| tree | c16247738b836598e31fb94aa101c4806748922f /recipes/python/nativesdk-prebuild-python.inc | |
| parent | bed3337b5fd6c65a1306536fd66b72213f23ece1 (diff) | |
| parent | a9e35b7be8144b7a470f0274abd820e1ad041eed (diff) | |
| download | meta-boot2qt-bf596ae52a666425a0e58b3fc9ab2c997d783b88.tar.gz | |
Merge remote-tracking branch 'origin/morty' into pyro
* origin/morty:
meta-qt5: update meta layer
qbsp: various improvements to qbsp creation
qbsp: update installer-framework
meta-qt5: update meta layer
meta-qt5: update meta layer
meta-qt5: update meta layer
automotive: update revisions
Conflicts:
recipes-qt/automotive/gammaray_git.bb
recipes-qt/automotive/neptune-ui_git.bb
recipes-qt/automotive/qtapplicationmanager_git.bb
recipes-qt/automotive/qtivi_git.bb
recipes-qt/qt5/qtquickcompiler_git.bb
scripts/manifest.xml
Change-Id: I73e99cd51cbe5f87021c02c19c12b6661a42c01b
Diffstat (limited to 'recipes/python/nativesdk-prebuild-python.inc')
0 files changed, 0 insertions, 0 deletions