diff options
| author | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-09-19 23:08:50 +0000 |
|---|---|---|
| committer | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-09-19 23:08:50 +0000 |
| commit | b9d2064f6eacff6db4af281df0b0db0a6b2199be (patch) | |
| tree | 2eec0730684a6f85a787540323a8e45dc0683689 /.gitignore | |
| parent | 6a9d7f8a2f2fc7f0dce1193e47140b60504337d2 (diff) | |
| download | webrtc-b9d2064f6eacff6db4af281df0b0db0a6b2199be.tar.gz | |
Roll Chromium 152335:157509, and add google_apis/build.
- gitignore google_apis.
- Disable 4005 warning in gflags.gyp.
TBR=niklas.enbom, kjellander
TESTED=trybots
Review URL: https://webrtc-codereview.appspot.com/819004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2792 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 29ef23ef8d..968e9467cb 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ .settings /build /chromium_deps +/google_apis /gyp-mac-tool /Makefile /out |