diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-08-19 08:15:38 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-08-19 08:18:18 (GMT) |
| commit | ca0b5b503e8865c0eedeea86aa132291281fc49f (patch) | |
| tree | 1eca392e65bf5be617a5189d93a8327cc9ec5e34 /src/xmlpatterns/schema/qxsdschemachecker_helper.cpp | |
| parent | f21096e918a587287d61446e930c40914e2b7ce5 (diff) | |
| parent | 23d2550e6d19c3e84ff2167f5696d4b6dd3f49d4 (diff) | |
| download | Qt-ca0b5b503e8865c0eedeea86aa132291281fc49f.zip Qt-ca0b5b503e8865c0eedeea86aa132291281fc49f.tar.gz Qt-ca0b5b503e8865c0eedeea86aa132291281fc49f.tar.bz2 | |
Merge branch 'master' into mmfphonon
Conflicts:
src/gui/itemviews/qitemselectionmodel.cpp
tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
Diffstat (limited to 'src/xmlpatterns/schema/qxsdschemachecker_helper.cpp')
| -rw-r--r-- | src/xmlpatterns/schema/qxsdschemachecker_helper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlpatterns/schema/qxsdschemachecker_helper.cpp b/src/xmlpatterns/schema/qxsdschemachecker_helper.cpp index 28957b7..a6cca4f 100644 --- a/src/xmlpatterns/schema/qxsdschemachecker_helper.cpp +++ b/src/xmlpatterns/schema/qxsdschemachecker_helper.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ |