diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-24 05:07:11 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-24 05:07:11 (GMT) |
| commit | 485f0bfd5761eff264712fcc0bd46c66470be505 (patch) | |
| tree | 24a9762a3d5c87d267fab398d5598dbd46b646fe /src/declarative/qml/qdeclarativecustomparser_p.h | |
| parent | 7c76abb0dc4204043bec9b6fa315f9753a7986ae (diff) | |
| parent | 4d615766184e3eeee25ffc634847bec1edd47ac0 (diff) | |
| download | Qt-485f0bfd5761eff264712fcc0bd46c66470be505.zip Qt-485f0bfd5761eff264712fcc0bd46c66470be505.tar.gz Qt-485f0bfd5761eff264712fcc0bd46c66470be505.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt
Conflicts:
tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp
tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
Diffstat (limited to 'src/declarative/qml/qdeclarativecustomparser_p.h')
0 files changed, 0 insertions, 0 deletions