summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2009-12-17 18:23:52 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2009-12-17 18:23:52 (GMT)
commitabdf1389c8f2602737abc202ab6219c8b04cfadf (patch)
tree01c91ef153163b177ada84e359565efdab3227dc /dist
parentb8a4b365b1105a742369bbaa5dc00e43914089e0 (diff)
parentca30ced65ead8e81dfcb25178f4bfb6244487356 (diff)
downloadQt-abdf1389c8f2602737abc202ab6219c8b04cfadf.zip
Qt-abdf1389c8f2602737abc202ab6219c8b04cfadf.tar.gz
Qt-abdf1389c8f2602737abc202ab6219c8b04cfadf.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: GL2Engine: Don't mark brush as dirty if it hasn't changed Doc: setFeature snippet was in the wrong place
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions