diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org> | 2014-11-10 06:51:34 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org> | 2014-11-10 06:51:34 +0000 |
| commit | bd495fab27ed04dec7cfdbf623edcff416971682 (patch) | |
| tree | 0614b5808c2846f00c601b5a7815cc4d7eac8e76 /.gitignore | |
| parent | 3c1970f9f38d042e8eadb1a6bee74d99a2781e65 (diff) | |
| download | webrtc-bd495fab27ed04dec7cfdbf623edcff416971682.tar.gz | |
.gitignore updates
Update after Chromium roll in https://review.webrtc.org/24179004/
and Android project updates in https://review.webrtc.org/25029004/
BUG=
TBR=phoglund@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/24239004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7665 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index cfcee71503..e6f0c88a5b 100644 --- a/.gitignore +++ b/.gitignore @@ -53,7 +53,9 @@ /talk/examples/android/bin /talk/examples/android/gen /talk/examples/android/libs +/talk/examples/android/local.properties /talk/examples/android/obj +/talk/examples/android/proguard-project.txt /testing /third_party/WebKit/Tools/Scripts /third_party/android_testrunner @@ -113,6 +115,7 @@ /tools/memory /tools/protoc_wrapper /tools/python +/tools/relocation_packer /tools/sanitizer_options /tools/swarming_client /tools/tsan_suppressions @@ -121,11 +124,15 @@ /webrtc/examples/android/media_demo/bin /webrtc/examples/android/media_demo/gen /webrtc/examples/android/media_demo/libs +/webrtc/examples/android/media_demo/local.properties /webrtc/examples/android/media_demo/obj +/webrtc/examples/android/media_demo/proguard-project.txt /webrtc/examples/android/opensl_loopback/bin /webrtc/examples/android/opensl_loopback/gen /webrtc/examples/android/opensl_loopback/libs +/webrtc/examples/android/opensl_loopback/local.properties /webrtc/examples/android/opensl_loopback/obj +/webrtc/examples/android/opensl_loopback/proguard-project.txt /webrtc/modules/audio_device/android/test/bin/ /webrtc/modules/audio_device/android/test/gen/ /webrtc/modules/audio_device/android/test/libs/ |