summaryrefslogtreecommitdiffstats
path: root/WEBKIT_MERGE_REVISION
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-22 23:28:20 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-22 23:28:20 +0000
commit891c71789b6f3382a5edec024c8a478df523d7fd (patch)
treea98920e94a0fc32e74e703810eec562e9179a5a5 /WEBKIT_MERGE_REVISION
parent5a7362fefe60518a51593ddbf4649bc48493d459 (diff)
downloadchromium_src-891c71789b6f3382a5edec024c8a478df523d7fd.zip
chromium_src-891c71789b6f3382a5edec024c8a478df523d7fd.tar.gz
chromium_src-891c71789b6f3382a5edec024c8a478df523d7fd.tar.bz2
Chrome side of webkit merge to 40124.
Not much here other than CanvasPixelArray being re-added in webkit@r40089. Changes: http://trac.webkit.org/changeset?new=40124@trunk&old=40086@trunk Review URL: http://codereview.chromium.org/16617 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'WEBKIT_MERGE_REVISION')
-rw-r--r--WEBKIT_MERGE_REVISION2
1 files changed, 1 insertions, 1 deletions
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 0ccdcbd..da0a336 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@40086 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@40124 \ No newline at end of file