diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2014-11-24 15:04:53 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2014-11-24 15:04:53 +0200 |
| commit | 69ecb0fe763a1757630732a965c65a9b7371f3b3 (patch) | |
| tree | 588ecdbac4626565d9a65f6a7e91cb2bf35aefc9 /scripts | |
| parent | 4120fbde76371e0445956c0b5b79a15cc20cd986 (diff) | |
| parent | 30b37c39b18ab15f521395dc2012e948475d2741 (diff) | |
| download | meta-boot2qt-69ecb0fe763a1757630732a965c65a9b7371f3b3.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
* origin/stable:
toolchain: include base-files
Update meta-fsl-arm-extra to fix u-boot-boundary fetch failure
Install fonts with help of Yocto recipes
bbb: remove preferred version for SGX
Update Qt logo
Remove u-boot-fw-utils
Change copyright notice
Conflicts:
b2qt-init-build-env
conf/distro/include/beaglebone.conf
recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
Change-Id: I5b22412d0530e70057f705da34247803498ddde3
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/setup-environment.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index d4bb051..62055a2 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | ## agreement. | 14 | ## agreement. |
| 15 | ## | 15 | ## |
| 16 | ## For further information use the contact form at | 16 | ## For further information use the contact form at |
| 17 | ## http://qt.digia.com/contact-us. | 17 | ## http://www.qt.io/contact-us. |
| 18 | ## | 18 | ## |
| 19 | ## | 19 | ## |
| 20 | ## $QT_END_LICENSE$ | 20 | ## $QT_END_LICENSE$ |