summaryrefslogtreecommitdiffstats
path: root/conf/distro/include/am335x-evm.conf
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2014-11-25 08:34:24 +0200
committerQt Gerrit Server <srv.gerrit-noreply@digia.com>2014-11-25 08:34:24 +0200
commit370405d39c2ad957a5a8a7c46c4d009f29144084 (patch)
tree74bcb18f2e47a35549d43ca4f5d4fb6e056be9a4 /conf/distro/include/am335x-evm.conf
parent1164922716f92ac99e81d4115ad25f567e765ed5 (diff)
parent69ecb0fe763a1757630732a965c65a9b7371f3b3 (diff)
downloadmeta-boot2qt-370405d39c2ad957a5a8a7c46c4d009f29144084.tar.gz
Merge "Merge remote-tracking branch 'origin/stable' into dev" into dev
Diffstat (limited to 'conf/distro/include/am335x-evm.conf')
-rw-r--r--conf/distro/include/am335x-evm.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index ad651e7..fcdd6da 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -13,7 +13,7 @@
13## agreement. 13## agreement.
14## 14##
15## For further information use the contact form at 15## For further information use the contact form at
16## http://qt.digia.com/contact-us. 16## http://www.qt.io/contact-us.
17## 17##
18## 18##
19## $QT_END_LICENSE$ 19## $QT_END_LICENSE$