summaryrefslogtreecommitdiffstats
path: root/src/xml
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2010-04-13 05:23:28 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2010-04-13 05:23:28 (GMT)
commit7fba97dc74a27f836abfcf4941dac6e247379798 (patch)
treead54e31c2650593c742652c75a73f984c2111e08 /src/xml
parent36e8506084f272a01cfdc50ab787e9d30da60360 (diff)
parentbae8e41ff7d12ac10f69a4f03d97e736dace500d (diff)
downloadQt-7fba97dc74a27f836abfcf4941dac6e247379798.zip
Qt-7fba97dc74a27f836abfcf4941dac6e247379798.tar.gz
Qt-7fba97dc74a27f836abfcf4941dac6e247379798.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts: tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
Diffstat (limited to 'src/xml')
0 files changed, 0 insertions, 0 deletions