summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-12-16 13:53:16 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-12-16 13:53:16 (GMT)
commit5e3e9c5600e3089073990fd752e0eaa0336c6301 (patch)
treee83ca7d4945faedbe657cfa35f3d4e908f3b089f /doc/src
parentdc9c4a91b01a1f0d05f2a62d420721b6b2be987e (diff)
parent870c4e7b9ce6143ae48f717265094d4f7e0d2434 (diff)
downloadQt-5e3e9c5600e3089073990fd752e0eaa0336c6301.zip
Qt-5e3e9c5600e3089073990fd752e0eaa0336c6301.tar.gz
Qt-5e3e9c5600e3089073990fd752e0eaa0336c6301.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix crash in positionInLigature
Diffstat (limited to 'doc/src')
0 files changed, 0 insertions, 0 deletions