diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-21 11:14:39 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-21 11:14:39 (GMT) |
commit | 45a549dd8ad57bdd070d40a3d0606ab8429ceda6 (patch) | |
tree | 5f92a00a379c55f2409bb0d34186db77bf37afa6 /doc/src/modules.qdoc | |
parent | cca06c0d740be179d5196ad7919253b7d52392ed (diff) | |
parent | f46cb7033fc3bfc17c4ccf9125d670810322a0f5 (diff) | |
download | Qt-45a549dd8ad57bdd070d40a3d0606ab8429ceda6.zip Qt-45a549dd8ad57bdd070d40a3d0606ab8429ceda6.tar.gz Qt-45a549dd8ad57bdd070d40a3d0606ab8429ceda6.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
bindTexture: Replace texture if painting is active on pixmap/image
Diffstat (limited to 'doc/src/modules.qdoc')
0 files changed, 0 insertions, 0 deletions