diff options
author | aavit <eirik.aavitsland@digia.com> | 2014-10-15 11:45:42 +0200 |
---|---|---|
committer | aavit <eirik.aavitsland@digia.com> | 2014-10-15 11:48:13 +0200 |
commit | 04374090fb5d5b5f57d7c15860635c4df27e26da (patch) | |
tree | 132fc7e8606ce33ec1ee422928d45919120859af /basicsuite/mediaplayer/Effects/EffectBillboard.qml | |
parent | dc12a6624b5f5a397e590d378bcf1f2a2f192e51 (diff) | |
parent | 11ea1829a7057531be95c188fee081a20a7e21c3 (diff) |
Merge branch 'stable' into dev
Change-Id: I0ff4fb4cb9acd73db397bc44c2970a7286a2d0c2
Diffstat (limited to 'basicsuite/mediaplayer/Effects/EffectBillboard.qml')
-rwxr-xr-x | basicsuite/mediaplayer/Effects/EffectBillboard.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/basicsuite/mediaplayer/Effects/EffectBillboard.qml b/basicsuite/mediaplayer/Effects/EffectBillboard.qml index 947209e..3f37e8e 100755 --- a/basicsuite/mediaplayer/Effects/EffectBillboard.qml +++ b/basicsuite/mediaplayer/Effects/EffectBillboard.qml @@ -11,8 +11,8 @@ ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** conditions see http://www.qt.io/licensing. For further information +** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser |