diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-22 04:12:05 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-22 04:12:05 (GMT) |
| commit | bf9ca539dc4c5efff801856ad9d3f7e14dabad26 (patch) | |
| tree | a5ae494b6e8a2b33f4345f484ba2ead04aca761e /tests/auto/qtabbar | |
| parent | b254be20c03d4dbfc1803cd40dc95d52115b955c (diff) | |
| parent | a34e2ab6f50cc91a4fca5cd7fd7bd22e6495b0c1 (diff) | |
| download | Qt-bf9ca539dc4c5efff801856ad9d3f7e14dabad26.zip Qt-bf9ca539dc4c5efff801856ad9d3f7e14dabad26.tar.gz Qt-bf9ca539dc4c5efff801856ad9d3f7e14dabad26.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7
Conflicts:
tools/qml/qml.pri
Diffstat (limited to 'tests/auto/qtabbar')
0 files changed, 0 insertions, 0 deletions