commit | 788acd17adf6b3d605b5ea66cf394eb81fc086a9 | [log] [tgz] |
---|---|---|
author | pbos@webrtc.org <pbos@webrtc.org> | Mon Dec 15 09:41:24 2014 +0000 |
committer | pbos@webrtc.org <pbos@webrtc.org> | Mon Dec 15 09:41:24 2014 +0000 |
tree | 2f08a4f673f34c31cfe1b2ffcf0acabae50b1563 | |
parent | fb108b5a28a538862a4157e17de795426d86af1e [diff] [blame] |
Merge audio_processing changes. R=aluebs@webrtc.org, bjornv@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/32769004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7893 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/.gitignore b/.gitignore index 581c3bf..1082352 100644 --- a/.gitignore +++ b/.gitignore
@@ -48,8 +48,7 @@ /links.db /net /out -/resources/*.* -/resources/*/*.* +/resources /talk/examples/android/bin /talk/examples/android/gen /talk/examples/android/libs