summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-20 07:54:57 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-20 07:54:57 (GMT)
commitce27cf24539e0c7971937e55d8539496ad51ee52 (patch)
tree86ddea82eca7e682409cbc2c568594a0116062c6 /src/xmlpatterns
parent6f44020cf97bd74e02ee011e6cb182aa93109b21 (diff)
parent1f10c6be975a2d36c05d926b332b869ad6339877 (diff)
downloadQt-ce27cf24539e0c7971937e55d8539496ad51ee52.zip
Qt-ce27cf24539e0c7971937e55d8539496ad51ee52.tar.gz
Qt-ce27cf24539e0c7971937e55d8539496ad51ee52.tar.bz2
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'src/xmlpatterns')
0 files changed, 0 insertions, 0 deletions