diff options
author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-16 00:12:15 (GMT) |
---|---|---|
committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-16 00:12:15 (GMT) |
commit | 655088bc1942698ee060ca5237a4220365e49ee1 (patch) | |
tree | 908437dbe06f9639534bc3546a9f3fe619d53449 /doc/src/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp | |
parent | 06d71fb79ad850c62a1b95fbeec607dfc4220489 (diff) | |
parent | 07f724cd5abd0548fb32ed3469bde113daf028c4 (diff) | |
download | Qt-655088bc1942698ee060ca5237a4220365e49ee1.zip Qt-655088bc1942698ee060ca5237a4220365e49ee1.tar.gz Qt-655088bc1942698ee060ca5237a4220365e49ee1.tar.bz2 |
Merge branch '4.7' of ../../qt/4.7 into 4.7
Conflicts:
configure
Diffstat (limited to 'doc/src/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp')
0 files changed, 0 insertions, 0 deletions