diff options
| author | Steve Block <steveblock@google.com> | 2009-11-05 09:23:40 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:12 +0000 |
| commit | cac0f67c402d107cdb10971b95719e2ff9c7c76b (patch) | |
| tree | d182c7f87211c6f201a5f038e332336493ebdbe7 /WebKit/chromium/DEPS | |
| parent | 4b2ef0f288e7c6c4602f621b7a0e9feed304b70e (diff) | |
| download | external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.zip external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.gz external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.bz2 | |
Merge webkit.org at r50258 : Initial merge by git.
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
Diffstat (limited to 'WebKit/chromium/DEPS')
| -rw-r--r-- | WebKit/chromium/DEPS | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS index 514a640..5f5b9b8 100644 --- a/WebKit/chromium/DEPS +++ b/WebKit/chromium/DEPS @@ -35,17 +35,18 @@ vars = { 'chromium_deps_svn': 'http://src.chromium.org/svn/trunk/deps/third_party', # Dependencies' revisions to use: - 'chromium_rev': '27692', + 'chromium_rev': '28710', 'google-url_rev': '119', - 'gyp_rev': '671', + 'gtest_rev': '329', + 'gyp_rev': '685', 'icu_rev': '27687', - 'openvcdiff_rev': '26', - 'skia_rev': '341', - 'v8_rev': '2966', + 'openvcdiff_rev': '28', + 'skia_rev': '376', + 'v8_rev': '3030', # Windows: 'cygwin_rev': '11984', - 'ffmpeg_ia32_rev': '26428', + 'ffmpeg_ia32_rev': '28488', 'pthreads-win32_rev': '26716', 'python_24_rev': '22967', } @@ -72,11 +73,15 @@ deps = { # testing 'testing': Var('chromium_svn')+'/testing@'+Var('chromium_rev'), + 'testing/gtest': + 'http://googletest.googlecode.com/svn/trunk@'+Var('gtest_rev'), # v8 javascript engine 'v8': 'http://v8.googlecode.com/svn/trunk@'+Var('v8_rev'), - + 'testing/gtest': + 'http://googletest.googlecode.com/svn/trunk@'+Var('gtest_rev'), + # net dependencies 'net': Var('chromium_svn')+'/net@'+Var('chromium_rev'), |