diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-13 12:04:29 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-13 12:04:29 (GMT) |
| commit | 7d805a6717692b540c02b8caace25a0b47c7f0d6 (patch) | |
| tree | 3368927682df73ac437e8f321ba28e51d1463cd0 /tests/arthur/README | |
| parent | c6ed32dc7e9c8a566f376d1baa7e616a1019f9af (diff) | |
| parent | 58d0e46dcc50a3cddabc177c9dfdfec5c66e932d (diff) | |
| download | Qt-7d805a6717692b540c02b8caace25a0b47c7f0d6.zip Qt-7d805a6717692b540c02b8caace25a0b47c7f0d6.tar.gz Qt-7d805a6717692b540c02b8caace25a0b47c7f0d6.tar.bz2 | |
Merge branch '4.7' of ../oslo-staging-2 into 4.7
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/getting-started/demos.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
doc/src/index.qdoc
src/declarative/qml/qdeclarativeimageprovider.cpp
Diffstat (limited to 'tests/arthur/README')
0 files changed, 0 insertions, 0 deletions