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/uiloader/baseline/listwidgeteditor.ui | |
| 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/uiloader/baseline/listwidgeteditor.ui')
| -rw-r--r-- | tests/auto/uiloader/baseline/listwidgeteditor.ui | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/uiloader/baseline/listwidgeteditor.ui b/tests/auto/uiloader/baseline/listwidgeteditor.ui index 9d3dd6996..bcfa9a4e7 100644 --- a/tests/auto/uiloader/baseline/listwidgeteditor.ui +++ b/tests/auto/uiloader/baseline/listwidgeteditor.ui @@ -15,7 +15,7 @@ ** addition, as a special exception, Trolltech gives you certain ** additional rights. These rights are described in the Trolltech GPL ** Exception version 1.2, which can be found at -** http://www.trolltech.com/products/qt/gplexception/ and in the file +** http://qt.nokia.com/products/qt/gplexception/ and in the file ** GPL_EXCEPTION.txt in this package. ** ** Please review the following information to ensure GNU General |