diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-17 11:52:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-17 11:52:35 (GMT) |
| commit | cca7c5b40751e2192ba2c7c7422557eeb5672a17 (patch) | |
| tree | dbff65640557790393937cc982d22a54213f3b6f /src/phonon | |
| parent | 0f8c867b1d5b13a56bd80f1819d4e71a9865b493 (diff) | |
| parent | 1f475f97bfaef06967c2325c4ecf7fb076e5a1fc (diff) | |
| download | Qt-cca7c5b40751e2192ba2c7c7422557eeb5672a17.zip Qt-cca7c5b40751e2192ba2c7c7422557eeb5672a17.tar.gz Qt-cca7c5b40751e2192ba2c7c7422557eeb5672a17.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:
Fix license text.
Doc: fix a typo in QML/Qt UI integration
Diffstat (limited to 'src/phonon')
0 files changed, 0 insertions, 0 deletions