summaryrefslogtreecommitdiff
path: root/src/xmlpatterns/schema/qxsdstatemachine.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-23 22:59:20 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-23 22:59:20 +1000
commita2adca3e63803ace785033bb43423a4961e0f2d0 (patch)
tree6f7567b6b98c3277746d35647e055912069a00dc /src/xmlpatterns/schema/qxsdstatemachine.cpp
parent21f021f8a7b2f25a6d42a872d3511ced4ec53fe2 (diff)
parent58f060499c12e47cecd800ae591ddd9548715f1d (diff)
downloadqtxmlpatterns-a2adca3e63803ace785033bb43423a4961e0f2d0.tar.gz
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtxmlpatterns-staging: Squashed commit of changes from the 4.8-temp branch. Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
Diffstat (limited to 'src/xmlpatterns/schema/qxsdstatemachine.cpp')
0 files changed, 0 insertions, 0 deletions