aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorArtem Titov <titovartem@webrtc.org>2018-06-27 13:23:17 +0200
committerArtem Titov <titovartem@webrtc.org>2018-06-27 13:04:08 +0000
commit42f0d78f1ee830ba6f62bc3c6364dba121144681 (patch)
treea244c27de15c048de2ac6b67271e23b553cf9d45 /.gitignore
parent67c8bcf8040a3d5b92cc47d6c58ae95aba2dc984 (diff)
downloadwebrtc-42f0d78f1ee830ba6f62bc3c6364dba121144681.tar.gz
Roll back checking in the third_party directory
This goes back to using a subtree mirror of Chromium's third_party directory (managed by gclient). The related scripts for syncing the files are also deleted. The plan is to solve the conflict by creating third_party directories in subdirectories of WebRTC rather than the repo root. Bug: webrtc:8366 Change-Id: I0b9f6a86c6d4075e2fa12c2db19aa54682ddb11f Reviewed-on: https://webrtc-review.googlesource.com/85300 Reviewed-by: Oleh Prypin <oprypin@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23757}
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ecd89ce27e..bf937369ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,7 @@
/mojo
/out
/testing
-/third_party_chromium
+/third_party
/tools
/tools_webrtc/android/profiling/flamegraph
/tools_webrtc/android/profiling/simpleperf