diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-07-20 22:51:51 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-07-20 22:51:51 (GMT) |
| commit | cd986f27c78077bc6ae4132ce720d5512c9d4539 (patch) | |
| tree | 1564d79b358d20588eaf120b9a26d8af95512458 /src/xmlpatterns/data/qitem.cpp | |
| parent | 3fad4bda10083acd6cfd0cad2c939808e9b26852 (diff) | |
| parent | a1a3535cd45819bd54310791bdcc1cec43f38b63 (diff) | |
| download | Qt-cd986f27c78077bc6ae4132ce720d5512c9d4539.zip Qt-cd986f27c78077bc6ae4132ce720d5512c9d4539.tar.gz Qt-cd986f27c78077bc6ae4132ce720d5512c9d4539.tar.bz2 | |
Merge remote branch 'origin/4.6' into 4.7-from-4.6
Conflicts:
tests/auto/qimagereader/tst_qimagereader.cpp
tools/qtestlib/chart/database.cpp
tools/qtestlib/chart/database.h
tools/qtestlib/chart/reportgenerator.cpp
tools/qtestlib/chart/reportgenerator.h
Diffstat (limited to 'src/xmlpatterns/data/qitem.cpp')
0 files changed, 0 insertions, 0 deletions