diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-12-07 08:49:47 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-12-07 08:49:47 +0200 |
| commit | 85e2dbf78e6ba044fea744367f16ccd1808c1810 (patch) | |
| tree | 87b31ac6c770274cf7e219c312b32d9d25af8b40 /scripts/upload.sh | |
| parent | 3587c4fb32e5046729608513bf4c189e846fefd4 (diff) | |
| parent | c97f13c28d29bd71c98043f709a5875606300142 (diff) | |
| download | meta-boot2qt-85e2dbf78e6ba044fea744367f16ccd1808c1810.tar.gz | |
Merge remote-tracking branch 'origin/dizzy' into dev
* origin/dizzy:
Use openembedded mirror from github
nitrogen6x: add u-boot binary back to the image
ostree: Add TLS support
ostree: patch upstream project
ostree: Add GNUPG to runtime dependencies.
Revert "Build nativesdk-ostree"
Remove unused b2qt-update-framework
Conflicts:
conf/distro/include/nitrogen6x.conf
recipes/ostree/ostree.bb
scripts/manifest.xml
scripts/manifest_fido.xml
Change-Id: Ie3884fa026fc8b8d7d05a9bff4b2beb124e4fd03
Diffstat (limited to 'scripts/upload.sh')
0 files changed, 0 insertions, 0 deletions