From 70bf4c997ea13320710f74e098d943e1d0f3fdda Mon Sep 17 00:00:00 2001
From: "Torne (Richard Coles)" <torne@google.com>
Date: Wed, 31 Jul 2013 11:30:01 +0100
Subject: Remove libjingle from the project list.

libjingle has moved upstream; stop merging it for now until we've
created the new project (or removed this dependency).

This reverts commit a20a107b5f4470d7fe1a483a493729220e8ba216.
---
 chromium/tools/merge_common.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'chromium/tools')

diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py
index 52f4ee8..46ece78 100644
--- a/chromium/tools/merge_common.py
+++ b/chromium/tools/merge_common.py
@@ -42,7 +42,6 @@ THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [
     'third_party/freetype',
     'third_party/icu',
     'third_party/leveldatabase/src',
-    'third_party/libjingle/source',
     'third_party/libphonenumber/src/phonenumbers',
     'third_party/libphonenumber/src/resources',
     'third_party/mesa/src',
-- 
cgit v1.2.3