Merge from Chromium at DEPS revision 263965
This commit was generated by merge_to_master.py.
Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
diff --git a/.gitignore b/.gitignore
index efdfa0a..cb53f38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@
*.vpwhistu
*.vtg
*.xcodeproj
+*.xcworkspace
*_proto.xml
*_proto_cpp.xml
*~
@@ -242,7 +243,6 @@
/third_party/freetype2/src
/third_party/gles2_conform
/third_party/gnu_binutils/
-/third_party/gold
/third_party/google_appengine_cloudstorage
/third_party/google_toolbox_for_mac/src
/third_party/googlemac