diff options
| author | axis <qt-info@nokia.com> | 2009-08-19 09:24:04 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-08-19 09:24:04 (GMT) |
| commit | 2d1b49bd21b788ba3e35fc5c41bf3aab42cbda65 (patch) | |
| tree | 24dae3a4532870d61282841f6bb186cb008ab747 /tests/auto/uic/baseline/bookwindow.ui.h | |
| parent | b3a3652abbf1cb4ebba6c6257ecf47f8dc022d93 (diff) | |
| parent | 20d2b7312456435e5e1a98dba7c2cc96b44fe83c (diff) | |
| download | Qt-2d1b49bd21b788ba3e35fc5c41bf3aab42cbda65.zip Qt-2d1b49bd21b788ba3e35fc5c41bf3aab42cbda65.tar.gz Qt-2d1b49bd21b788ba3e35fc5c41bf3aab42cbda65.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/auto.pro
Diffstat (limited to 'tests/auto/uic/baseline/bookwindow.ui.h')
| -rw-r--r-- | tests/auto/uic/baseline/bookwindow.ui.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/uic/baseline/bookwindow.ui.h b/tests/auto/uic/baseline/bookwindow.ui.h index 776f9e9..92639ec 100644 --- a/tests/auto/uic/baseline/bookwindow.ui.h +++ b/tests/auto/uic/baseline/bookwindow.ui.h @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading UI file 'bookwindow.ui' ** -** Created: Thu Jul 10 09:47:34 2008 -** by: Qt User Interface Compiler version 4.5.0 +** Created: Tue Aug 18 19:03:31 2009 +** by: Qt User Interface Compiler version 4.6.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ |