summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2015-01-21 14:50:05 +0000
committerTorne (Richard Coles) <torne@google.com>2015-01-21 14:50:05 +0000
commit2d50636ba2727b3fb1fb2357fad512d293e307c5 (patch)
treebe13b14897eb5e25b9c48a387696ad3cde83a0fe
parentec3f91c2254a4a87db039560486ad2cd1c24cd5a (diff)
downloadWebKit-2d50636ba2727b3fb1fb2357fad512d293e307c5.tar.gz
Record Chromium merge at DEPS revision 40.0.2214.89
This commit was generated by merge_to_master.py. Change-Id: I8cd7b717307b1f0844015808a0402a95af169552
-rw-r--r--.merged-revisions1
1 files changed, 1 insertions, 0 deletions
diff --git a/.merged-revisions b/.merged-revisions
index 7dfaf204b..00536e0a7 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -60,3 +60,4 @@ eed44c943c9f046859ac3ff92f33e340b7a48ba7 e867532940814305af6919ad0d230a066310772
bbc94673cb67ec241a14093b662f45afed88ee1a a1c277b4ba5f16d867fe198d39a4991139d78f6f fc04b46a390d35fcf850563609d38b3fd52da64d
dda3e71dfec2cee8b52aafff7db353bc1a8aa0f6 fdb9e630f6269d516d306945c53a1ad035dd2911 c51dda7029d7ec562d3caafcee88b47bd18c283d
2e473b9e39cddff89bc3b5dbc4b62c6443d140e0 097478c1a38c1b7c44825045bf02f635e0948918 cd3498425a25bc6a7cb057ad90721d5f312346e6
+ec3f91c2254a4a87db039560486ad2cd1c24cd5a 9e75a9e8e78755bdac83500676c5d9a933921504 55853ee1cec3fd97a73955bafe02bc24fd046a61