summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/textdocument-frames
diff options
context:
space:
mode:
authorBill King <bking@trolltech.com>2010-02-09 06:11:09 (GMT)
committerBill King <bking@trolltech.com>2010-02-09 06:11:09 (GMT)
commit3318d412cb78a545790761161f243cb49da4abb7 (patch)
tree62d6612926f7bbcce8a1a28cbdb1a382339aa566 /doc/src/snippets/textdocument-frames
parent7370dceadf969288a22c564728398cc7cb119d82 (diff)
parent72f3caa5d7821b93a4e807fb61c5cda9f2c6f393 (diff)
downloadQt-3318d412cb78a545790761161f243cb49da4abb7.zip
Qt-3318d412cb78a545790761161f243cb49da4abb7.tar.gz
Qt-3318d412cb78a545790761161f243cb49da4abb7.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6
Diffstat (limited to 'doc/src/snippets/textdocument-frames')
-rw-r--r--doc/src/snippets/textdocument-frames/main.cpp2
-rw-r--r--doc/src/snippets/textdocument-frames/mainwindow.cpp2
-rw-r--r--doc/src/snippets/textdocument-frames/mainwindow.h2
-rw-r--r--doc/src/snippets/textdocument-frames/xmlwriter.cpp2
-rw-r--r--doc/src/snippets/textdocument-frames/xmlwriter.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/snippets/textdocument-frames/main.cpp b/doc/src/snippets/textdocument-frames/main.cpp
index 07d65a2..599063f 100644
--- a/doc/src/snippets/textdocument-frames/main.cpp
+++ b/doc/src/snippets/textdocument-frames/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/doc/src/snippets/textdocument-frames/mainwindow.cpp b/doc/src/snippets/textdocument-frames/mainwindow.cpp
index 1f49087..47474f4 100644
--- a/doc/src/snippets/textdocument-frames/mainwindow.cpp
+++ b/doc/src/snippets/textdocument-frames/mainwindow.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/doc/src/snippets/textdocument-frames/mainwindow.h b/doc/src/snippets/textdocument-frames/mainwindow.h
index 9db69d6..a66fd1d 100644
--- a/doc/src/snippets/textdocument-frames/mainwindow.h
+++ b/doc/src/snippets/textdocument-frames/mainwindow.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/doc/src/snippets/textdocument-frames/xmlwriter.cpp b/doc/src/snippets/textdocument-frames/xmlwriter.cpp
index ccd7af6..41c0a83 100644
--- a/doc/src/snippets/textdocument-frames/xmlwriter.cpp
+++ b/doc/src/snippets/textdocument-frames/xmlwriter.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/doc/src/snippets/textdocument-frames/xmlwriter.h b/doc/src/snippets/textdocument-frames/xmlwriter.h
index ec1765b..d7c9d3a 100644
--- a/doc/src/snippets/textdocument-frames/xmlwriter.h
+++ b/doc/src/snippets/textdocument-frames/xmlwriter.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**