summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-15 23:13:00 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-15 23:13:00 (GMT)
commitd3d2a48cc3a65596ce54ac443de3c04fe84b9621 (patch)
tree38eb75d807bf92df228ea2aa9f88aeacc6228791 /src/3rdparty
parent4ebc4ab2fa98d3433292b07e7022892c9549e700 (diff)
parentb7e6c2835ad7b5f5564290c1140c1db59869d54e (diff)
downloadQt-d3d2a48cc3a65596ce54ac443de3c04fe84b9621.zip
Qt-d3d2a48cc3a65596ce54ac443de3c04fe84b9621.tar.gz
Qt-d3d2a48cc3a65596ce54ac443de3c04fe84b9621.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: create magic comment messages in "finished" state make QT_TR_NOOP work in static initializers make HashString and HashStringList objects smaller remove pointless manual assignments from token type enum
Diffstat (limited to 'src/3rdparty')
0 files changed, 0 insertions, 0 deletions