summaryrefslogtreecommitdiffstats
path: root/doc/src/legal/gpl.qdoc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-14 10:52:33 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-14 10:52:33 (GMT)
commit47f894350cc48a6fdc4b5cc4c47c4c7f072678f9 (patch)
treeed73ede0a8c4041d7c62657072d3b6c639bd142b /doc/src/legal/gpl.qdoc
parentb915d0aa46599f707df4db6eb33965602a2d7422 (diff)
parente0c4899b46a68b37ce743c5a1ffd17596cbaa44c (diff)
downloadQt-47f894350cc48a6fdc4b5cc4c47c4c7f072678f9.zip
Qt-47f894350cc48a6fdc4b5cc4c47c4c7f072678f9.tar.gz
Qt-47f894350cc48a6fdc4b5cc4c47c4c7f072678f9.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: Mac: restoreGeometry() [Regression] Build failure on Mac Carbon doc: Added some \briefs to how-to docs. Some 4.7 changes. Updated changelog. Cherry pick fix for MOBILITY-932 from Qt Mobility. Cherry pick fix for MOBILITY-962 from Qt Mobility. Cherry pick fix for MOBILITY-828 from Qt Mobility. Bearer management changes from Qt Mobility. Cherry pick fix for MOBILITY-828 from Qt Mobility. Added snippet labels to QML Dial example. Fixed documentation typo.
Diffstat (limited to 'doc/src/legal/gpl.qdoc')
0 files changed, 0 insertions, 0 deletions