diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-31 10:26:40 +0200 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-31 10:26:40 +0200 |
commit | 8a58bde27c9e23cd8a5688fdc50b6b74d25411a6 (patch) | |
tree | 28102e03233c45524aa75cbdbcb9287d6b8bc1f4 /src/xmlpatterns/schema/qxsdattribute_p.h | |
parent | 8529d7e3ace4994cd2caf563bb437f2c5c38bcee (diff) | |
parent | 624ea78d71dca5112272597f9f1ee165c2275c5c (diff) | |
download | qt4-tools-8a58bde27c9e23cd8a5688fdc50b6b74d25411a6.tar.gz |
Merge branch '4.5' into 4.6
Conflicts:
tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp
Diffstat (limited to 'src/xmlpatterns/schema/qxsdattribute_p.h')
0 files changed, 0 insertions, 0 deletions