diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-20 02:03:14 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-20 02:03:14 +1000 |
commit | c14af1c242ea3b268a4b6a5df62869bfd0efb6c4 (patch) | |
tree | 19c8ea6930ef2def91e9f2597aceb12c4306aac6 /doc/src/snippets/code/src_script_qscriptvalueiterator.cpp | |
parent | 159572e52132067d74b39fb9209d72c20633bba4 (diff) | |
parent | 55c2ea18c522bd8700f43884124e02b460cdb5e2 (diff) | |
download | qt4-tools-c14af1c242ea3b268a4b6a5df62869bfd0efb6c4.tar.gz |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptvalueiterator.cpp')
0 files changed, 0 insertions, 0 deletions