diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-17 12:57:56 +0200 |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-17 12:57:56 +0200 |
| commit | 9756f523fd1c31192a87c65449434280a59b49f7 (patch) | |
| tree | 9a4c15749c903e00355ac9b519c9791eddd2f877 /src/activeqt/control/qaxfactory.h | |
| parent | 33893addb13f80fe1decef325514853e695fe30c (diff) | |
| parent | 3a55f0eab402a72a0f98fdfe5505614fed5d19ed (diff) | |
| download | qt4-tools-9756f523fd1c31192a87c65449434280a59b49f7.tar.gz | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/graphicsview/qgraphicsscene_p.h
Diffstat (limited to 'src/activeqt/control/qaxfactory.h')
| -rw-r--r-- | src/activeqt/control/qaxfactory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h index e5bb9c1976..416bdee131 100644 --- a/src/activeqt/control/qaxfactory.h +++ b/src/activeqt/control/qaxfactory.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 ActiveQt framework of the Qt Toolkit. ** |