diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-15 17:11:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-15 17:11:11 (GMT) |
| commit | 7455ba4fdc82bc8e7174184090ddfbf03c312446 (patch) | |
| tree | 4c30852ee30c8974b2482c5525dc8046a4d0cb52 /src/3rdparty/webkit/VERSION | |
| parent | f95d5bde3ba66dd182802addd15dabbfa85611e1 (diff) | |
| parent | 42dda19d82ceea48f19d356cfaf2b26acb763df8 (diff) | |
| download | Qt-7455ba4fdc82bc8e7174184090ddfbf03c312446.zip Qt-7455ba4fdc82bc8e7174184090ddfbf03c312446.tar.gz Qt-7455ba4fdc82bc8e7174184090ddfbf03c312446.tar.bz2 | |
Merge remote branch 'qt/master' into staging-2-master
Conflicts:
tests/auto/qlineedit/tst_qlineedit.cpp
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 4348cbc..cc0e04f 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 - da5d96a26e80162027bc95ce7e5725fe4b277ff7 + ffae5e11181a3961193fa21ea405851cad714d4b |