diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-15 08:25:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-15 08:25:35 (GMT) |
| commit | af5984ef163894b6eb43894aa4075e947642bb6d (patch) | |
| tree | 8240e02b281583c30ae7195160d82bdb4aa4c6a6 /tools | |
| parent | c01231089fe396689310f56529d06ab4136296fa (diff) | |
| parent | 27de60f2f6047cb3f698825af96e569fde04ef06 (diff) | |
| download | Qt-af5984ef163894b6eb43894aa4075e947642bb6d.zip Qt-af5984ef163894b6eb43894aa4075e947642bb6d.tar.gz Qt-af5984ef163894b6eb43894aa4075e947642bb6d.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:
Add extra type of embedded license.
Fix possible null pointer dereference.
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions