summaryrefslogtreecommitdiffstats
path: root/src/network/socket/socket.pri
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-28 09:13:31 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-28 09:13:31 (GMT)
commiteedc18d1fdcf7c359916304cbf0b4629bbf70c84 (patch)
tree740a4f145cf97132d89dccf473507144262d3ba0 /src/network/socket/socket.pri
parentf8ca41ab91748a4b847892af642c1a5a1cdeb105 (diff)
parent61630603636e544ff81258090dbdcd175c5c51e8 (diff)
downloadQt-eedc18d1fdcf7c359916304cbf0b4629bbf70c84.zip
Qt-eedc18d1fdcf7c359916304cbf0b4629bbf70c84.tar.gz
Qt-eedc18d1fdcf7c359916304cbf0b4629bbf70c84.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Prevent stroking zero length lines in qstroker.cpp Make the animation driver private API Stop using XLFD as fontconfig matching fallback OpenGL Framebuffer Format
Diffstat (limited to 'src/network/socket/socket.pri')
0 files changed, 0 insertions, 0 deletions