summaryrefslogtreecommitdiffstats
path: root/chromium/tools/merge_common.py
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/tools/merge_common.py')
-rw-r--r--chromium/tools/merge_common.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py
index 82306c6..c38df88 100644
--- a/chromium/tools/merge_common.py
+++ b/chromium/tools/merge_common.py
@@ -36,7 +36,7 @@ THIRD_PARTY_PROJECTS_WITH_FLAT_HISTORY = [
THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [
'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',