diff options
author | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:17:06 +0200 |
---|---|---|
committer | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:21:34 +0200 |
commit | d9e4b5c1820e62700756ede2ef5290baccc3c1b2 (patch) | |
tree | cc6975c1bd3ea86e4b7e5373560603e5165b7ff4 /tests/testapplications/qsgimage | |
parent | f4d4689d3c09cb4eae30be892be426d4fa185ed4 (diff) | |
parent | fb7ab18fa799032f37fd6f78ab34b76aff91ed6c (diff) |
Merge branch 'stable' into release
Change-Id: I13e80072db1e2c14a37b6a123276be81b085e87e
Diffstat (limited to 'tests/testapplications/qsgimage')
-rw-r--r-- | tests/testapplications/qsgimage/ImageNG.qml | 2 | ||||
-rw-r--r-- | tests/testapplications/qsgimage/img-align.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/testapplications/qsgimage/ImageNG.qml b/tests/testapplications/qsgimage/ImageNG.qml index 42f1748816..f5717042d5 100644 --- a/tests/testapplications/qsgimage/ImageNG.qml +++ b/tests/testapplications/qsgimage/ImageNG.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. diff --git a/tests/testapplications/qsgimage/img-align.qml b/tests/testapplications/qsgimage/img-align.qml index e7bc7b19fd..2d7bfc1356 100644 --- a/tests/testapplications/qsgimage/img-align.qml +++ b/tests/testapplications/qsgimage/img-align.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. |