diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-04-20 14:17:33 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-04-20 14:19:13 +0300 |
| commit | 61b4e74f5daaa43cde2a7594e8f70cbd2364263e (patch) | |
| tree | acc6a88e44bf684a8de484ca56f222c32eb35fe4 /scripts/setup-environment.sh | |
| parent | 28a32f08bb3c24081efa28598125a663b3ea264b (diff) | |
| parent | 6e3ac7bfe108acf3e84d073f9067302a39709f2f (diff) | |
| download | meta-boot2qt-61b4e74f5daaa43cde2a7594e8f70cbd2364263e.tar.gz | |
Merge remote-tracking branch 'origin/morty' into pyro
* origin/morty:
6e3ac7b meta-qt5: update meta layer
b250388 meta-qt5: update meta layer
763a607 qtdeviceutilities: update revision
0c1582c poky: update to latest revision in morty branch
4489683 nuc: use modprobe to load kernel module
45f1fec quickcompiler: Update QC to 5.9.5 version
65f8274 nuc: enable boot from internal sd cardreader
Conflicts:
meta-boot2qt/recipes-graphics/hunspell/hunspell-dicts_git.bb
meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
scripts/manifest.xml
Change-Id: I6fbfe531d34716aacb4a7220c4fc2688152651a2
Diffstat (limited to 'scripts/setup-environment.sh')
0 files changed, 0 insertions, 0 deletions