diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-10-02 10:32:26 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-10-02 10:32:26 (GMT) |
| commit | 13a1cc06e9c65205d4485091c97800a7eea68cc6 (patch) | |
| tree | 0a34a2f04462fd841066ad5110b8121f4b21bbe6 /README.s60 | |
| parent | b0b8d8f7a65e31c0edabe7fbe6ee91bb62a67d7c (diff) | |
| parent | 0573653f830fada99311c88ab46e8f5a37854b90 (diff) | |
| download | Qt-13a1cc06e9c65205d4485091c97800a7eea68cc6.zip Qt-13a1cc06e9c65205d4485091c97800a7eea68cc6.tar.gz Qt-13a1cc06e9c65205d4485091c97800a7eea68cc6.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsscene_p.h
Diffstat (limited to 'README.s60')
0 files changed, 0 insertions, 0 deletions