diff options
| author | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:49:21 +0200 |
|---|---|---|
| committer | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:50:15 +0200 |
| commit | 862f941bdc02f104e3aecc756a003f1c1f9f5112 (patch) | |
| tree | 3ad5342cc2806d4dd51b88f26a9ff9e6eb30e63e /examples/declarative/positioners/qml/positioners | |
| parent | 758349e729134061bb29583846826c47badb0472 (diff) | |
| parent | f7680b55f0d1d1ef102d40166f74cf4eee605e44 (diff) | |
Merge branch 'stable' into release
Change-Id: Ib992a6e988e06887f7a4b3bc581514aa6a5b8886
Diffstat (limited to 'examples/declarative/positioners/qml/positioners')
| -rw-r--r-- | examples/declarative/positioners/qml/positioners/Button.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/positioners/qml/positioners/positioners.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/positioners/qml/positioners/Button.qml b/examples/declarative/positioners/qml/positioners/Button.qml index dacef038..be1df4ce 100644 --- a/examples/declarative/positioners/qml/positioners/Button.qml +++ b/examples/declarative/positioners/qml/positioners/Button.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 examples of the Qt Toolkit. diff --git a/examples/declarative/positioners/qml/positioners/positioners.qml b/examples/declarative/positioners/qml/positioners/positioners.qml index 816a8376..f0d1867c 100644 --- a/examples/declarative/positioners/qml/positioners/positioners.qml +++ b/examples/declarative/positioners/qml/positioners/positioners.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 examples of the Qt Toolkit. |