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

3 files changed, 3 insertions, 3 deletions

diff --git a/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend b/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend
index fd7dd31..0b4beff 100644
--- a/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend
+++ b/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend
@@ -13,7 +13,7 @@
 ## agreement.
 ##
 ## For further information use the contact form at
-## http://qt.digia.com/contact-us.
+## http://www.qt.io/contact-us.
 ##
 ##
 ## $QT_END_LICENSE$
diff --git a/meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend b/meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend
index 9e195dc..502edf1 100644
--- a/meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend
+++ b/meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend
@@ -13,7 +13,7 @@
 ## agreement.
 ##
 ## For further information use the contact form at
-## http://qt.digia.com/contact-us.
+## http://www.qt.io/contact-us.
 ##
 ##
 ## $QT_END_LICENSE$
diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend
index b2d6104..b6f70cd 100644
--- a/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend
+++ b/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend
@@ -13,7 +13,7 @@
 ## agreement.
 ##
 ## For further information use the contact form at
-## http://qt.digia.com/contact-us.
+## http://www.qt.io/contact-us.
 ##
 ##
 ## $QT_END_LICENSE$