diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-23 18:15:11 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-23 18:15:11 +0000 |
| commit | 8d27a1c7238fc66fad6b1928b7f92947eb0bfc38 (patch) | |
| tree | 0f1ee9d726dc5e10f48770ee5fd2e0dc63f5e727 /.gitignore | |
| parent | 6879c8adad604d51db200de56f9afe08282973a6 (diff) | |
| download | webrtc-8d27a1c7238fc66fad6b1928b7f92947eb0bfc38.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. Also disables 64 bit Mac builds for libjingle
BUG=1932
TESTED=git try
R=andrew@webrtc.org, fischman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1851004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4385 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 17d8f835e7..a96f2f2562 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,8 +62,10 @@ /third_party/libyuv /third_party/llvm-build /third_party/oauth2 +/third_party/openssl /third_party/opus /third_party/protobuf +/third_party/sqlite /third_party/valgrind /third_party/winsdk_samples/src /third_party/yasm |