summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-07-08 19:38:38 +0100
committerKristian Monsen <kristianm@google.com>2011-07-08 19:38:38 +0100
commit7d783978775620a35b5247ff0da339567326478e (patch)
tree97f2fde07dcb6caf3ac9836b84b237b6732dd4ed
parentcfb4826edae011aed657a813297687800ed85e17 (diff)
downloadexternal_chromium-7d783978775620a35b5247ff0da339567326478e.zip
external_chromium-7d783978775620a35b5247ff0da339567326478e.tar.gz
external_chromium-7d783978775620a35b5247ff0da339567326478e.tar.bz2
Merge Chromium at r12.0.742.93: Update CHROMIUM_MERGE_REVISION
Change-Id: If23b83cf0319e1beab74284bac07982c895642b2
-rw-r--r--CHROMIUM_MERGE_REVISION4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHROMIUM_MERGE_REVISION b/CHROMIUM_MERGE_REVISION
index 932bb90..6f27c1d 100644
--- a/CHROMIUM_MERGE_REVISION
+++ b/CHROMIUM_MERGE_REVISION
@@ -1,4 +1,4 @@
We use a Chromium revision that has been used for a Chromium release.
-http://src.chromium.org/svn/releases/11.0.696.0/DEPS
-/trunk/src@77261
+http://src.chromium.org/svn/releases/12.0.742.93/DEPS
+/branches/742/src@88489