diff options
author | Morten Sørvig <msorvig@trolltech.com> | 2009-08-24 12:02:51 (GMT) |
---|---|---|
committer | Morten Sørvig <msorvig@trolltech.com> | 2009-08-24 12:02:51 (GMT) |
commit | e3078a5db9e092d78813180ce077789551929e4f (patch) | |
tree | fce2a4b5607c8dc796faececf71f78ae83effe4e /src/gui/widgets/qcombobox.cpp | |
parent | 3a801a667c7c78076fc4aa84e47432ddd4a382a5 (diff) | |
parent | db0ebfd97d14bf3c537957d9642ba014318f8418 (diff) | |
download | Qt-e3078a5db9e092d78813180ce077789551929e4f.zip Qt-e3078a5db9e092d78813180ce077789551929e4f.tar.gz Qt-e3078a5db9e092d78813180ce077789551929e4f.tar.bz2 |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui/widgets/qcombobox.cpp')
-rw-r--r-- | src/gui/widgets/qcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index 2b6d5dd..de36c2e 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -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$ ** ****************************************************************************/ |