summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-05-20 10:01:47 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-05-20 10:01:47 (GMT)
commitf692eb8a65524f8ac166c660fbaa87f0dbfd8b79 (patch)
tree4fc667e80df43e5ec458eea151da081ed1c78b01 /doc
parent387db114cf09e60b43b13c36c83ef8cf07ee6553 (diff)
parent4a8c7e432931b27e7a5440a6d15bde999e962f35 (diff)
downloadQt-f692eb8a65524f8ac166c660fbaa87f0dbfd8b79.zip
Qt-f692eb8a65524f8ac166c660fbaa87f0dbfd8b79.tar.gz
Qt-f692eb8a65524f8ac166c660fbaa87f0dbfd8b79.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'doc')
-rw-r--r--doc/src/examples/trafficinfo.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/examples/trafficinfo.qdoc b/doc/src/examples/trafficinfo.qdoc
index c9b6890..13181cd 100644
--- a/doc/src/examples/trafficinfo.qdoc
+++ b/doc/src/examples/trafficinfo.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
**
** This file is part of the documentation of the Qt Toolkit.