diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-22 00:32:42 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-22 00:32:42 +0000 |
| commit | 84dee7fa8a7098e54f1dd12a028bc1ea9a76c99b (patch) | |
| tree | 0c23acf1a8489a94f164b1c0a4e113317e905a61 /webkit/tools | |
| parent | 65383e62cd5f143c96c6fbd458817c9eb1854c9c (diff) | |
| download | chromium_src-84dee7fa8a7098e54f1dd12a028bc1ea9a76c99b.zip chromium_src-84dee7fa8a7098e54f1dd12a028bc1ea9a76c99b.tar.gz chromium_src-84dee7fa8a7098e54f1dd12a028bc1ea9a76c99b.tar.bz2 | |
Update deps and the merge tool now that WebKit and WebKitLibraries have been deleted.
Review URL: http://codereview.chromium.org/11370
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rwxr-xr-x | webkit/tools/merge/merge.py | 2 |
1 files changed, 0 insertions, 2 deletions
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) |