summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-19 21:47:13 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-19 21:47:13 (GMT)
commit68af2fdbb25f8b77a7f314d19d1a0cc50b114e37 (patch)
treebf7d6305fa743c73ae7a7f10e9d60ebd01e6d2ae /doc
parent91db91cc7d91f767c2cba340d930b72d69a968b8 (diff)
parentc5809ade611d93c165dbde8c6ee618da73b0ad48 (diff)
downloadQt-68af2fdbb25f8b77a7f314d19d1a0cc50b114e37.zip
Qt-68af2fdbb25f8b77a7f314d19d1a0cc50b114e37.tar.gz
Qt-68af2fdbb25f8b77a7f314d19d1a0cc50b114e37.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Memory leak in native Toolbar cleanup in Cocoa Fix copyright year. Bump version to 4.6.2. Add skeleton changes file for 4.6.2. Add released version of 4.6.1 changes file for posterity. Designer crashes when previewing QMainWindow with native Toolbar on Mac
Diffstat (limited to 'doc')
-rw-r--r--doc/src/modules.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 298e0be..44d6ed6 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -1046,7 +1046,7 @@
distributed under the following license.
\legalese
- Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\br
+ Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br
All rights reserved.\br
Contact: Nokia Corporation (qt-info@nokia.com)