diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-18 18:33:55 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-18 18:33:55 +0000 |
| commit | 4e4bf4db8bbbfda5d98f89d8475b9762afa2a8c8 (patch) | |
| tree | 8b6fd855d661c9fc6eeb0e0a799e846bfb5737ac /.gitignore | |
| parent | c6d5b50b418683aa28018fb44517fa2a993ee181 (diff) | |
| download | webrtc-4e4bf4db8bbbfda5d98f89d8475b9762afa2a8c8.tar.gz | |
Makes webrtc and libjingle build from the same gyp-file. Also, the libjingle and webrtc DEPS revisions were mismatching. This cl takes the most recent revision of mismatches.
TESTED=git try
BUG=1932
R=andrew@webrtc.org, fischman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1804004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4372 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 17d8f835e7..ccba8289f0 100644 --- a/.gitignore +++ b/.gitignore @@ -51,7 +51,9 @@ /third_party/gold /third_party/google-gflags/src /third_party/google-visualization-python +/third_party/icu /third_party/jsoncpp +/third_party/junit /third_party/libjingle /third_party/libjpeg /third_party/libjpeg_turbo @@ -60,6 +62,7 @@ /third_party/libyuv /third_party/llvm-build /third_party/oauth2 +/third_party/openssl /third_party/opus /third_party/protobuf /third_party/valgrind |