summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/textblock-fragments
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2011-01-18 11:44:56 (GMT)
committeraavit <qt-info@nokia.com>2011-01-18 11:44:56 (GMT)
commitbef9617c1f0a1c5f2c4aa9bc9e9ab4334a6b0f81 (patch)
treea44006d06de4c7aea7e1ea792261f001ebd8d373 /doc/src/snippets/textblock-fragments
parentce089742eb9caed768beed0ae68b2623a9cdf2ca (diff)
parent46ba213883cf46871ef539ef4d2304064b671175 (diff)
downloadQt-bef9617c1f0a1c5f2c4aa9bc9e9ab4334a6b0f81.zip
Qt-bef9617c1f0a1c5f2c4aa9bc9e9ab4334a6b0f81.tar.gz
Qt-bef9617c1f0a1c5f2c4aa9bc9e9ab4334a6b0f81.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'doc/src/snippets/textblock-fragments')
-rw-r--r--doc/src/snippets/textblock-fragments/main.cpp2
-rw-r--r--doc/src/snippets/textblock-fragments/mainwindow.cpp2
-rw-r--r--doc/src/snippets/textblock-fragments/mainwindow.h2
-rw-r--r--doc/src/snippets/textblock-fragments/xmlwriter.cpp2
-rw-r--r--doc/src/snippets/textblock-fragments/xmlwriter.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/snippets/textblock-fragments/main.cpp b/doc/src/snippets/textblock-fragments/main.cpp
index cd4429c..6e40492 100644
--- a/doc/src/snippets/textblock-fragments/main.cpp
+++ b/doc/src/snippets/textblock-fragments/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/doc/src/snippets/textblock-fragments/mainwindow.cpp b/doc/src/snippets/textblock-fragments/mainwindow.cpp
index 8da87b0..91bed61 100644
--- a/doc/src/snippets/textblock-fragments/mainwindow.cpp
+++ b/doc/src/snippets/textblock-fragments/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/doc/src/snippets/textblock-fragments/mainwindow.h b/doc/src/snippets/textblock-fragments/mainwindow.h
index da0bb05..e10c351 100644
--- a/doc/src/snippets/textblock-fragments/mainwindow.h
+++ b/doc/src/snippets/textblock-fragments/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)
**
diff --git a/doc/src/snippets/textblock-fragments/xmlwriter.cpp b/doc/src/snippets/textblock-fragments/xmlwriter.cpp
index 7a29016..9f66d9a 100644
--- a/doc/src/snippets/textblock-fragments/xmlwriter.cpp
+++ b/doc/src/snippets/textblock-fragments/xmlwriter.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/doc/src/snippets/textblock-fragments/xmlwriter.h b/doc/src/snippets/textblock-fragments/xmlwriter.h
index 725e5ad..4a3d95b 100644
--- a/doc/src/snippets/textblock-fragments/xmlwriter.h
+++ b/doc/src/snippets/textblock-fragments/xmlwriter.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)
**