diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-17 09:23:06 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-17 09:23:06 (GMT) |
| commit | 9657c4fa2040758b8aa3a5f7f7c81442cbaba621 (patch) | |
| tree | 1d9b018f9563fa6eff1059291dc9edf94be67c9b /examples/mainwindows/application | |
| parent | b5d34f3daafc843c9f9cb63cf8e2733900f0be69 (diff) | |
| parent | ec0d663282e191bfb9837e76e709ed2ffe6e8aac (diff) | |
| download | Qt-9657c4fa2040758b8aa3a5f7f7c81442cbaba621.zip Qt-9657c4fa2040758b8aa3a5f7f7c81442cbaba621.tar.gz Qt-9657c4fa2040758b8aa3a5f7f7c81442cbaba621.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Conflicts:
doc/src/declarative/elements.qdoc
doc/src/declarative/extending.qdoc
src/declarative/qml/qdeclarativecomponent.cpp
Diffstat (limited to 'examples/mainwindows/application')
| -rw-r--r-- | examples/mainwindows/application/main.cpp | 2 | ||||
| -rw-r--r-- | examples/mainwindows/application/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | examples/mainwindows/application/mainwindow.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/mainwindows/application/main.cpp b/examples/mainwindows/application/main.cpp index 483f0ac..9a9dc9c 100644 --- a/examples/mainwindows/application/main.cpp +++ b/examples/mainwindows/application/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/mainwindows/application/mainwindow.cpp b/examples/mainwindows/application/mainwindow.cpp index 3a40495..4ebc5c1 100644 --- a/examples/mainwindows/application/mainwindow.cpp +++ b/examples/mainwindows/application/mainwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/mainwindows/application/mainwindow.h b/examples/mainwindows/application/mainwindow.h index ac9bbfa..9d40d30 100644 --- a/examples/mainwindows/application/mainwindow.h +++ b/examples/mainwindows/application/mainwindow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |