summaryrefslogtreecommitdiffstats
path: root/examples/network
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-28 16:50:34 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-28 16:50:34 (GMT)
commit9d636095403f5abecbdff8ffffe658f35ff10001 (patch)
treefda62cb14f16f3a8b92b5cd41dc972cac4a19ef6 /examples/network
parentc69b74008c72b7e2da5ff4bc57112b89d0a36d7d (diff)
parentb383ff766764f4d0d9644ca06bfb049d62bdcf2f (diff)
downloadQt-9d636095403f5abecbdff8ffffe658f35ff10001.zip
Qt-9d636095403f5abecbdff8ffffe658f35ff10001.tar.gz
Qt-9d636095403f5abecbdff8ffffe658f35ff10001.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix a regression: icons with slightly wrong ICO header did not load. Fixed an endless loop if printing web pages. don't build unneeded QtDesigner parts on Windows CE Better support for user-generated binary shaders
Diffstat (limited to 'examples/network')
0 files changed, 0 insertions, 0 deletions