diff options
| author | Bo Liu <boliu@google.com> | 2013-06-19 17:39:41 +0000 |
|---|---|---|
| committer | Bo Liu <boliu@google.com> | 2013-06-19 17:39:41 +0000 |
| commit | f85152d3feb7e2102312d3fbc60cbd3d633237ad (patch) | |
| tree | 08fb5af69c70f65e74b52863e072c3a05544172b /chromium/tools | |
| parent | 25b96b14b9f77ae4317836b6501149715f489263 (diff) | |
| download | android_frameworks_webview-f85152d3feb7e2102312d3fbc60cbd3d633237ad.tar.gz android_frameworks_webview-f85152d3feb7e2102312d3fbc60cbd3d633237ad.tar.bz2 android_frameworks_webview-f85152d3feb7e2102312d3fbc60cbd3d633237ad.zip | |
Revert "Merge third_party/angle_dx11 replacing third_party/angle"
This reverts commit 25b96b14b9f77ae4317836b6501149715f489263.
Upstream reverted due to incorrectly using codesite svn that cannot handle the load of all of chromium. Should have used GoB mirror instead.
http://src.chromium.org/viewvc/chrome?revision=207244&view=revision
Change-Id: Ia0fb2f72317cddfaadd932bc62bdf8c6958fb170
Diffstat (limited to 'chromium/tools')
| -rw-r--r-- | chromium/tools/merge_common.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py index 573e8b0..a31b677 100644 --- a/chromium/tools/merge_common.py +++ b/chromium/tools/merge_common.py @@ -37,7 +37,7 @@ THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [ 'googleurl', 'sdch/open-vcdiff', 'testing/gtest', - 'third_party/angle_dx11', + 'third_party/angle', 'third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille', 'third_party/freetype', 'third_party/icu', |