diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2014-11-25 08:34:24 +0200 |
|---|---|---|
| committer | Qt Gerrit Server <srv.gerrit-noreply@digia.com> | 2014-11-25 08:34:24 +0200 |
| commit | 370405d39c2ad957a5a8a7c46c4d009f29144084 (patch) | |
| tree | 74bcb18f2e47a35549d43ca4f5d4fb6e056be9a4 /recipes/opengldummy | |
| parent | 1164922716f92ac99e81d4115ad25f567e765ed5 (diff) | |
| parent | 69ecb0fe763a1757630732a965c65a9b7371f3b3 (diff) | |
| download | meta-boot2qt-370405d39c2ad957a5a8a7c46c4d009f29144084.tar.gz | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into dev
Diffstat (limited to 'recipes/opengldummy')
| -rw-r--r-- | recipes/opengldummy/opengldummy.bb | 2 | ||||
| -rw-r--r-- | recipes/opengldummy/opengldummy.inc | 2 | ||||
| -rw-r--r-- | recipes/opengldummy/qtglesstream-dummy-client.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/recipes/opengldummy/opengldummy.bb b/recipes/opengldummy/opengldummy.bb index 1f4f975..b33e060 100644 --- a/recipes/opengldummy/opengldummy.bb +++ b/recipes/opengldummy/opengldummy.bb | |||
| @@ -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$ |
diff --git a/recipes/opengldummy/opengldummy.inc b/recipes/opengldummy/opengldummy.inc index 3e24058..23af5df 100644 --- a/recipes/opengldummy/opengldummy.inc +++ b/recipes/opengldummy/opengldummy.inc | |||
| @@ -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$ |
diff --git a/recipes/opengldummy/qtglesstream-dummy-client.bb b/recipes/opengldummy/qtglesstream-dummy-client.bb index b3b3e37..4c8c86a 100644 --- a/recipes/opengldummy/qtglesstream-dummy-client.bb +++ b/recipes/opengldummy/qtglesstream-dummy-client.bb | |||
| @@ -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$ |