diff options
| -rw-r--r-- | DEPS | 8 | ||||
| -rwxr-xr-x | webkit/tools/merge/merge.py | 2 |
2 files changed, 7 insertions, 3 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@5865", + "/trunk/deps/third_party/WebKit@5870", "src/third_party/icu38": "/trunk/deps/third_party/icu38@5749", @@ -22,6 +22,12 @@ deps = { "src/webkit/data/layout_tests/LayoutTests": "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38575", + + "src/third_party/WebKit/WebKit": + "http://svn.webkit.org/repository/webkit/trunk/WebKit@38575", + + "src/third_party/WebKit/WebKitLibraries": + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@38575", } diff --git a/webkit/tools/merge/merge.py b/webkit/tools/merge/merge.py index 1639ba4..e6cfd6b 100755 --- a/webkit/tools/merge/merge.py +++ b/webkit/tools/merge/merge.py @@ -132,8 +132,6 @@ def main(options, args): options.dry_run, options.diff3_cmd) merger.MergeDirectory("JavaScriptCore") merger.MergeDirectory("WebCore") - merger.MergeDirectory("WebKit") - merger.MergeDirectory("WebKitLibraries") UpdateWebKitMergeRevision(webkit_merge_revision_path, repository, new_revision, options.dry_run) |