aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorfischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-08-15 23:31:30 +0000
committerfischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-08-15 23:31:30 +0000
commitdde7d4c6ed0db879a348fa775da17ff2dca2f4d7 (patch)
tree687460c944e56f14b1eff70666d14d7bcf5172d3 /.gitignore
parentcc9238e385bca5bd1ebe95d38bb49798cd9d567a (diff)
downloadwebrtc-dde7d4c6ed0db879a348fa775da17ff2dca2f4d7.tar.gz
Roll chromium_revision 214260:217707 and gflags 45:84
gflags roll is needed mostly to pick up fixes for warnings triggered by newer compiler/settings pulled in by the chromium roll. Had to switch from the old google-gflags project the current gflags project to pick up this fix (see https://code.google.com/p/gflags/source/detail?r=74 for details). Update android build.xml file to reflect tools moves in new SDK pulled in by the chromium_revision roll. R=niklas.enbom@webrtc.org, wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2043004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4555 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 301e7ee48d..7fb825bbbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,8 +54,8 @@
/third_party/directxsdk
/third_party/expat
/third_party/gaeunit
+/third_party/gflags/src
/third_party/gold
-/third_party/google-gflags/src
/third_party/google-visualization-python
/third_party/icu
/third_party/jsoncpp