diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-15 12:16:31 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-15 12:16:31 +0100 |
| commit | 0de6073388f4e2780db8536178b129cd8f6ab386 (patch) | |
| tree | f22df67d2450c33e245fa27d50f001b403434315 /DEPS | |
| parent | 237b4e8281feb4bb44a23557a97fcbbd55133d68 (diff) | |
| download | chromium_org-0de6073388f4e2780db8536178b129cd8f6ab386.tar.gz | |
Merge from Chromium at DEPS revision 269467
This commit was generated by merge_to_master.py.
Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -4,8 +4,10 @@ # See http://code.google.com/p/chromium/wiki/UsingGit # # To test manually, run: -# python tools/deps2git/deps2git.py -o .DEPS.git +# python tools/deps2git/deps2git.py -o .DEPS.git -w <gclientdir> # gclient runhooks +# where <gcliendir> is the absolute path to the directory containing the +# .gclient file (the parent of "src"). # DO NOT CHECK IN CHANGES TO .DEPS.git. It will be automatically updated by # a bot when you modify this one. # @@ -23,7 +25,7 @@ vars = { "libcxxabi_revision": "206024", "webkit_trunk": "http://src.chromium.org/blink/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "173743", + "webkit_revision": "173750", "chromium_git": "https://chromium.googlesource.com", "chromiumos_git": "https://chromium.googlesource.com/chromiumos", "skia_git": "https://skia.googlesource.com", |