diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-16 08:32:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-16 08:32:06 (GMT) |
| commit | 8acc9157993f565c8cd5e1a2e0b914f028095c22 (patch) | |
| tree | 13b93c5d41f1394150bdb12a2411af81e56516d5 /mkspecs/aix-g++-64/qmake.conf | |
| parent | 9c9215201c3213b0c6532245ea430452e603bf88 (diff) | |
| parent | e32635b46b2f2b78eb18c5b195e0bdaf8c7f9b71 (diff) | |
| download | Qt-8acc9157993f565c8cd5e1a2e0b914f028095c22.zip Qt-8acc9157993f565c8cd5e1a2e0b914f028095c22.tar.gz Qt-8acc9157993f565c8cd5e1a2e0b914f028095c22.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 7932e8da6bfdeff653c572c22aed879c8c308829 )
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5e9b2a88688f6e360d7db00bc86a45bf2cf86e52
Buildfix for MSVC2008 (C90 violation)
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 1313dc84678c74f1c24f910f702d7ed27a417607
Diffstat (limited to 'mkspecs/aix-g++-64/qmake.conf')
0 files changed, 0 insertions, 0 deletions