diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-12-09 01:10:54 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-12-09 01:10:54 (GMT) |
| commit | 6efa3aa2fb9694e3275fac7412f9f930c715c628 (patch) | |
| tree | c6ac25ee98e0b1438385efe8bcbf435b9c0ed25a /src/gui/s60framework/qs60mainappui.h | |
| parent | 58ae252e5555dc379b4ed500532bc51ff7bebc25 (diff) | |
| parent | ec44803109910127657b214f4556651a9619430d (diff) | |
| download | Qt-6efa3aa2fb9694e3275fac7412f9f930c715c628.zip Qt-6efa3aa2fb9694e3275fac7412f9f930c715c628.tar.gz Qt-6efa3aa2fb9694e3275fac7412f9f930c715c628.tar.bz2 | |
Merge qtsoftware:qt/qt.git#4.7 into qtsoftware:qt/qt-qml.git#4.7
Conflicts:
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/gui/s60framework/qs60mainappui.h')
0 files changed, 0 insertions, 0 deletions