diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-06 12:25:10 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-06 12:25:10 (GMT) |
| commit | 9923c171853b2f8b4a3a6b096d263fa6cf461a0b (patch) | |
| tree | 38ea3966fcd11725c7d3c1606be637a000c233fd /tests/auto/uic/baseline/connectdialog.ui.h | |
| parent | bc83b5856416e5927822ee3e758d231fc9f43c38 (diff) | |
| parent | 8dbc32699dec7aa928eb9518c05437f481d11a43 (diff) | |
| download | Qt-9923c171853b2f8b4a3a6b096d263fa6cf461a0b.zip Qt-9923c171853b2f8b4a3a6b096d263fa6cf461a0b.tar.gz Qt-9923c171853b2f8b4a3a6b096d263fa6cf461a0b.tar.bz2 | |
merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
Diffstat (limited to 'tests/auto/uic/baseline/connectdialog.ui.h')
| -rw-r--r-- | tests/auto/uic/baseline/connectdialog.ui.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/uic/baseline/connectdialog.ui.h b/tests/auto/uic/baseline/connectdialog.ui.h index b90de56..d7e0eaf 100644 --- a/tests/auto/uic/baseline/connectdialog.ui.h +++ b/tests/auto/uic/baseline/connectdialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'connectdialog.ui' +** Form generated from reading UI file 'connectdialog.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef CONNECTDIALOG_H |