summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/doc.cpp
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-01-21 15:33:57 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-01-21 15:33:57 (GMT)
commit226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22 (patch)
tree491c25c4c9f08b6ef732a9179d2e64776a9e8446 /tools/qdoc3/doc.cpp
parent84a1df764bf2e29e9e6e43f4f0e1a69201199fbc (diff)
parent59a35a794e433f9526aff72025c0899e76ef362e (diff)
downloadQt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.zip
Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.tar.gz
Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.tar.bz2
Merge branch '4.7' into qdoc-simplified
Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
Diffstat (limited to 'tools/qdoc3/doc.cpp')
-rw-r--r--tools/qdoc3/doc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index 140545a..76c47a2 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.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)
**