diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
| commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
| tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /doc/src/snippets/qtquick1/column | |
| parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
| parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) | |
| download | qtdeclarative-animation-refactor.tar.gz | |
Merge branch 'master' into animation-refactorwip/animation-refactoranimation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'doc/src/snippets/qtquick1/column')
| -rw-r--r-- | doc/src/snippets/qtquick1/column/column.qml | 2 | ||||
| -rw-r--r-- | doc/src/snippets/qtquick1/column/vertical-positioner.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/qtquick1/column/column.qml b/doc/src/snippets/qtquick1/column/column.qml index b101c4cbac..b862d36430 100644 --- a/doc/src/snippets/qtquick1/column/column.qml +++ b/doc/src/snippets/qtquick1/column/column.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/src/snippets/qtquick1/column/vertical-positioner.qml b/doc/src/snippets/qtquick1/column/vertical-positioner.qml index bd57d94292..86dff0382e 100644 --- a/doc/src/snippets/qtquick1/column/vertical-positioner.qml +++ b/doc/src/snippets/qtquick1/column/vertical-positioner.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** |