diff options
| author | Alex Luebs <aluebs@google.com> | 2016-01-15 11:18:15 -0800 |
|---|---|---|
| committer | Alex Luebs <aluebs@google.com> | 2016-01-15 11:28:47 -0800 |
| commit | daef292e03c8d7d32e650495612f336c1830013a (patch) | |
| tree | 28c4cf735dd5bd9cc8f1ccd06fff8a173b20d1cb /webrtc/.gitignore | |
| parent | fe8b4a657979b49e1701bd92f6d5814a99e0b2be (diff) | |
| parent | 04cb763955aadf29324ec124b55aa399a7645d51 (diff) | |
| download | webrtc-daef292e03c8d7d32e650495612f336c1830013a.tar.gz | |
Merge upstream SHA 04cb763
* git merge 04cb763
* See all upstream changes since the previous merge in branch aosp/upstream-master: git diff cb3f9bd..04cb763
* Modify webrtc/.gitignore to keep *.mk files.
* Removed old files from *.mk files:
- thread.cc
- thread_posix.cc
* Add new files to *.mk files:
- event_tracer.cc
* Android relevant upstream changes:
- Make Beamforming dynamically settable for Android platform builds
- Remove additional channel constraints when Beamforming is enabled in AudioProcessing
- Use an explicit identifier in Config
Change-Id: I384a4e8f6982c31c5bc70eef521bb2d90800b9a4
Diffstat (limited to 'webrtc/.gitignore')
| -rw-r--r-- | webrtc/.gitignore | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/webrtc/.gitignore b/webrtc/.gitignore index dade989c6e..89cb6dbe09 100644 --- a/webrtc/.gitignore +++ b/webrtc/.gitignore @@ -1 +1,27 @@ -# This file is for projects that checkout webrtc/ directly (e.g. Chromium). +# This file is for projects that checkout webrtc/ directly (e.g. Chromium). It +# is a truncated copy of the .gitignore file in the parent directory. +*.DS_Store +*.Makefile +*.ncb +*.ninja +*.props +*.pyc +*.rules +*.scons +*.sdf +*.sln +*.suo +*.targets +*.user +*.vcproj +*.vcxproj +*.vcxproj.filters +*.vpj +*.vpw +*.vpwhistu +*.vtg +*.xcodeproj +*_proto.xml +*_proto_cpp.xml +*~ +.*.sw? |