commit 4aab98dbcc33a94cc58b884ecc623e56d6b0e03a
author Bo Liu <boliu@google.com> Mon Dec 16 22:39:30 2013 -0800
committer Bo Liu <boliu@google.com> Mon Dec 16 22:39:30 2013 -0800
tree 335822019a0f82bc9431efc7a4fe6fff3048ab2d
parent d1d110d8139cf8347ed7c30b1ac78829ce861f32

Do not merge third_party/angle_dx11

This is no longer needed and replaced by third_party/angle.

Change-Id: I19c8303745dd0211e96416fe77c3c4f0a3f0e2cc

chromium/tools/merge_common.py

diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py
index e0bda24..c38df88 100644
--- a/chromium/tools/merge_common.py
+++ b/chromium/tools/merge_common.py
@@ -37,7 +37,6 @@
     'sdch/open-vcdiff',
     'testing/gtest',
     'third_party/angle',
-    'third_party/angle_dx11',
     'third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille',
     'third_party/freetype',
     'third_party/icu',