summaryrefslogtreecommitdiffstats
path: root/src/corelib/xml/qxmlstream.g
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-01-19 01:40:49 (GMT)
committerMartin Jones <martin.jones@nokia.com>2011-01-19 01:40:49 (GMT)
commitebd4bc73c46c2962742a682b6a391fb68c482aec (patch)
tree3045a1af9e65ca6500437d4e90ccfd3637fb6976 /src/corelib/xml/qxmlstream.g
parent9c1e67d83f6175f339e6771be05ee60ba72426b3 (diff)
parent5d9738ed88da269033333299c16558882d346514 (diff)
downloadQt-ebd4bc73c46c2962742a682b6a391fb68c482aec.zip
Qt-ebd4bc73c46c2962742a682b6a391fb68c482aec.tar.gz
Qt-ebd4bc73c46c2962742a682b6a391fb68c482aec.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'src/corelib/xml/qxmlstream.g')
-rw-r--r--src/corelib/xml/qxmlstream.g2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/xml/qxmlstream.g b/src/corelib/xml/qxmlstream.g
index e91408f..3088632 100644
--- a/src/corelib/xml/qxmlstream.g
+++ b/src/corelib/xml/qxmlstream.g
@@ -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)
--