diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-01 06:34:29 (GMT) |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-01 06:56:50 (GMT) |
commit | 394b7ae6421afb0e309b6207fa2b1fce2e44426e (patch) | |
tree | 1b978136d45f813288ede835fdcdeb008b34cadf /src/3rdparty/webkit/VERSION | |
parent | dc1cab966938edc5463f26189607ece134549a22 (diff) | |
parent | 26af4d54ea4f3a48d053038f34a00aa1119a585b (diff) | |
download | Qt-394b7ae6421afb0e309b6207fa2b1fce2e44426e.zip Qt-394b7ae6421afb0e309b6207fa2b1fce2e44426e.tar.gz Qt-394b7ae6421afb0e309b6207fa2b1fce2e44426e.tar.bz2 |
Merge commit 'origin/4.6' into oslo1-master
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.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 6fe71d6..221c020 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 - 8f5ca3ba5da63a47d4f90bbd867d3e8453443dd3 + a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 |