diff options
| author | mread <qt-info@nokia.com> | 2010-07-02 10:50:23 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2010-07-02 10:50:23 (GMT) |
| commit | 65316c0fcf9f0a406fd714622407e2b0e767fe7b (patch) | |
| tree | b22c5f1d6d314a972302b8a996bde43dc3ddd2af /demos/books | |
| parent | 36f4d17a139c58cf00d3d9222dd2d35603ac09e8 (diff) | |
| parent | 1636e03a2fda5108cb4389689a327e65c47dfe0e (diff) | |
| download | Qt-65316c0fcf9f0a406fd714622407e2b0e767fe7b.zip Qt-65316c0fcf9f0a406fd714622407e2b0e767fe7b.tar.gz Qt-65316c0fcf9f0a406fd714622407e2b0e767fe7b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts fixed:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'demos/books')
0 files changed, 0 insertions, 0 deletions