summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-18 17:21:11 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-18 17:21:11 (GMT)
commit75792528141ebf3dc6f36f2efcd771dfaef6e703 (patch)
treef08a22ce025532a7061bf744a95ccaca3716292a /tools/qdoc3/doc
parent9a5b5f4a70bad52b922fd0a2973b44dae945da13 (diff)
parenta9c3f7169faf4621d39714f753d6e8b376c5d6e5 (diff)
downloadQt-75792528141ebf3dc6f36f2efcd771dfaef6e703.zip
Qt-75792528141ebf3dc6f36f2efcd771dfaef6e703.tar.gz
Qt-75792528141ebf3dc6f36f2efcd771dfaef6e703.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix sporadic hang in QLocalServer::close() in OS X 10.7 Qt Linguist: Fix crash after select 2nd translation in lengthvariant
Diffstat (limited to 'tools/qdoc3/doc')
0 files changed, 0 insertions, 0 deletions