diff options
author | Morten Sørvig <msorvig@trolltech.com> | 2009-08-24 14:02:51 +0200 |
---|---|---|
committer | Morten Sørvig <msorvig@trolltech.com> | 2009-08-24 14:02:51 +0200 |
commit | e3078a5db9e092d78813180ce077789551929e4f (patch) | |
tree | fce2a4b5607c8dc796faececf71f78ae83effe4e /tests/auto/uic3/baseline/qactivexselect.ui.4 | |
parent | 3a801a667c7c78076fc4aa84e47432ddd4a382a5 (diff) | |
parent | db0ebfd97d14bf3c537957d9642ba014318f8418 (diff) |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'tests/auto/uic3/baseline/qactivexselect.ui.4')
-rw-r--r-- | tests/auto/uic3/baseline/qactivexselect.ui.4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/uic3/baseline/qactivexselect.ui.4 b/tests/auto/uic3/baseline/qactivexselect.ui.4 index 1f1bb99bc..d200d9010 100644 --- a/tests/auto/uic3/baseline/qactivexselect.ui.4 +++ b/tests/auto/uic3/baseline/qactivexselect.ui.4 @@ -10,7 +10,7 @@ ** licenses for Windows may use this file in accordance with the Qt Commercial ** License Agreement provided with the Software. ** -** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for +** See http://qt.nokia.com/pricing.html or email sales@trolltech.com for ** information about Qt Commercial License Agreements. ** ** Contact qt-info@nokia.com if any conditions of this licensing are |