diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:08:56 +0100 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:08:56 +0100 |
commit | 9c54d0ef8f6442e32d5762edccef46db80b68681 (patch) | |
tree | 0fdbc2be98a2e7fd7728a3860d56c94db3e173bb /src/quick/doc/snippets/qml/codingconventions | |
parent | 1512835ee1425a3e874d2f2dd2b01f1a1ea7b763 (diff) | |
parent | 36a42ed6b11dce102d0e0f93fbd441011b003157 (diff) |
Merge branch 'stable' into dev
Conflicts:
src/qml/doc/qtqml.qdocconf
src/quick/doc/qtquick.qdocconf
Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9
Diffstat (limited to 'src/quick/doc/snippets/qml/codingconventions')
5 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/doc/snippets/qml/codingconventions/dotproperties.qml b/src/quick/doc/snippets/qml/codingconventions/dotproperties.qml index 55ab8d2d7a..bbb40a77ee 100644 --- a/src/quick/doc/snippets/qml/codingconventions/dotproperties.qml +++ b/src/quick/doc/snippets/qml/codingconventions/dotproperties.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 documentation of the Qt Toolkit. diff --git a/src/quick/doc/snippets/qml/codingconventions/javascript-imports.qml b/src/quick/doc/snippets/qml/codingconventions/javascript-imports.qml index 0d41f838d9..fd8301cebe 100644 --- a/src/quick/doc/snippets/qml/codingconventions/javascript-imports.qml +++ b/src/quick/doc/snippets/qml/codingconventions/javascript-imports.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 documentation of the Qt Toolkit. diff --git a/src/quick/doc/snippets/qml/codingconventions/javascript.qml b/src/quick/doc/snippets/qml/codingconventions/javascript.qml index 1980bc3242..72c954f699 100644 --- a/src/quick/doc/snippets/qml/codingconventions/javascript.qml +++ b/src/quick/doc/snippets/qml/codingconventions/javascript.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 documentation of the Qt Toolkit. diff --git a/src/quick/doc/snippets/qml/codingconventions/lists.qml b/src/quick/doc/snippets/qml/codingconventions/lists.qml index c2ff4e360c..c45129187e 100644 --- a/src/quick/doc/snippets/qml/codingconventions/lists.qml +++ b/src/quick/doc/snippets/qml/codingconventions/lists.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 documentation of the Qt Toolkit. diff --git a/src/quick/doc/snippets/qml/codingconventions/photo.qml b/src/quick/doc/snippets/qml/codingconventions/photo.qml index ffbecf786c..5260f87127 100644 --- a/src/quick/doc/snippets/qml/codingconventions/photo.qml +++ b/src/quick/doc/snippets/qml/codingconventions/photo.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 documentation of the Qt Toolkit. |