diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-17 10:57:56 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-17 10:57:56 (GMT) |
| commit | 9756f523fd1c31192a87c65449434280a59b49f7 (patch) | |
| tree | 9a4c15749c903e00355ac9b519c9791eddd2f877 /src/sql/drivers/odbc | |
| parent | 33893addb13f80fe1decef325514853e695fe30c (diff) | |
| parent | 3a55f0eab402a72a0f98fdfe5505614fed5d19ed (diff) | |
| download | Qt-9756f523fd1c31192a87c65449434280a59b49f7.zip Qt-9756f523fd1c31192a87c65449434280a59b49f7.tar.gz Qt-9756f523fd1c31192a87c65449434280a59b49f7.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/graphicsview/qgraphicsscene_p.h
Diffstat (limited to 'src/sql/drivers/odbc')
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 4 | ||||
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index 6667c91..164e82c 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 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 QtSql module 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 qt-sales@nokia.com. +** contact the sales department at http://www.qtsoftware.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/sql/drivers/odbc/qsql_odbc.h b/src/sql/drivers/odbc/qsql_odbc.h index 51f53ea..1207ee1 100644 --- a/src/sql/drivers/odbc/qsql_odbc.h +++ b/src/sql/drivers/odbc/qsql_odbc.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 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 QtSql module 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 qt-sales@nokia.com. +** contact the sales department at http://www.qtsoftware.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ |