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/text/fonts/hello | |
| parent | 758349e729134061bb29583846826c47badb0472 (diff) | |
| parent | f7680b55f0d1d1ef102d40166f74cf4eee605e44 (diff) | |
Merge branch 'stable' into release
Change-Id: Ib992a6e988e06887f7a4b3bc581514aa6a5b8886
Diffstat (limited to 'examples/declarative/text/fonts/hello')
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/declarative/text/fonts/hello/main.cpp b/examples/declarative/text/fonts/hello/main.cpp index d17afe97..586e763e 100644 --- a/examples/declarative/text/fonts/hello/main.cpp +++ b/examples/declarative/text/fonts/hello/main.cpp @@ -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/text/fonts/hello/qml/hello/availableFonts.qml b/examples/declarative/text/fonts/hello/qml/hello/availableFonts.qml index a58c2a00..5d75412d 100644 --- a/examples/declarative/text/fonts/hello/qml/hello/availableFonts.qml +++ b/examples/declarative/text/fonts/hello/qml/hello/availableFonts.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/text/fonts/hello/qml/hello/banner.qml b/examples/declarative/text/fonts/hello/qml/hello/banner.qml index 41779b07..3185096a 100644 --- a/examples/declarative/text/fonts/hello/qml/hello/banner.qml +++ b/examples/declarative/text/fonts/hello/qml/hello/banner.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/text/fonts/hello/qml/hello/fonts.qml b/examples/declarative/text/fonts/hello/qml/hello/fonts.qml index b4e07b57..fb998274 100644 --- a/examples/declarative/text/fonts/hello/qml/hello/fonts.qml +++ b/examples/declarative/text/fonts/hello/qml/hello/fonts.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/text/fonts/hello/qml/hello/hello.qml b/examples/declarative/text/fonts/hello/qml/hello/hello.qml index c60f6a38..55d1806f 100644 --- a/examples/declarative/text/fonts/hello/qml/hello/hello.qml +++ b/examples/declarative/text/fonts/hello/qml/hello/hello.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. |