diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-07 15:27:18 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-07 15:27:55 +0200 |
| commit | 28748d7e7b4b113a43997aef9e20f8b3ee8b22da (patch) | |
| tree | 8ef8d358ce295a962eb447c676923c482d8e322a /meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch | |
| parent | f32773e4c9e2ef685b335a18cf5bb0ebe8dbee87 (diff) | |
| parent | e1f20329102f9f973744eea4750df390b9d4112a (diff) | |
| download | meta-boot2qt-28748d7e7b4b113a43997aef9e20f8b3ee8b22da.tar.gz | |
Merge remote-tracking branch 'origin/sumo' into thud
* origin/sumo:
e1f2032 meta-qt5: update layer
b469160 gcc-cross-canadian: Do not create symlink to real-ld
7e819da Enable boot2qt launcher automatic demo mode
fdefea4 Implement NFS mounting for Intel NUCs
526c468 meta-qt5: update layer
be15ea8 meta-qt5: update layer
a0e0bd8 meta-qt5: update layer
5e98190 Update GammaRay for 5.12.1
cbb12da meta-qt5: update layer
Conflicts:
meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
scripts/manifest.xml
Change-Id: If57bb34b7b8547933f6d39c7f588eb42c68a4cb7
Diffstat (limited to 'meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch')
0 files changed, 0 insertions, 0 deletions