Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Unified Diff: .gitignore

Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Resolved merge conflict Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | PRESUBMIT.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: .gitignore
diff --git a/.gitignore b/.gitignore
index c043601a7e1572d6059b33e8c3fd333a68190ae0..51e2249bcc311942aea200f432cf520960f315b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -162,5 +162,9 @@
/webrtc/modules/audio_device/android/test/bin/
/webrtc/modules/audio_device/android/test/gen/
/webrtc/modules/audio_device/android/test/libs/
+/webrtc/video_engine/test/android/bin
+/webrtc/video_engine/test/android/gen
+/webrtc/video_engine/test/android/libs
+/webrtc/video_engine/test/android/obj
/x86-generic_out/
/xcodebuild
« no previous file with comments | « no previous file | PRESUBMIT.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698