diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-09 14:59:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-09 14:59:19 (GMT) |
| commit | e09c61235dab9de1111372ee05eb51004eda5569 (patch) | |
| tree | bb9b6d404e1a3e6bedac121096d9a1076eb80655 /src/3rdparty/webkit/VERSION | |
| parent | 64a360f45ab9a1c50ca628cfd6b670b93816c756 (diff) | |
| parent | 06add85eb8a9bd8f53acd162ce665d46e7ebc137 (diff) | |
| download | Qt-e09c61235dab9de1111372ee05eb51004eda5569.zip Qt-e09c61235dab9de1111372ee05eb51004eda5569.tar.gz Qt-e09c61235dab9de1111372ee05eb51004eda5569.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:
Regressions in Global Object prototype access
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 )
Autotest: fix paths on the test server after update.
Fix typo in docs.
Diffstat (limited to 'src/3rdparty/webkit/VERSION')
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 45608c5..7c9ea04 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - e3dc4ef2b801d91e115c54f833fa7766d392ceda + 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 |