Merge branch 'master' of github.com:google/protobuf into integrate_from_master
diff --git a/.gitignore b/.gitignore
index c21c20c..6508ecc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@
*.pyc
*.egg-info
*_pb2.py
+python/*.egg
python/.eggs/
python/build/
python/google/protobuf/compiler/
@@ -82,3 +83,9 @@
# NuGet packages: we want the repository configuration, but not the
# packages themselves.
/csharp/src/packages/*/
+
+# Directories created by opening the Objective C Xcode projects.
+objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcuserdata/
+objectivec/ProtocolBuffers_OSX.xcodeproj/xcuserdata/
+objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcuserdata/
+objectivec/ProtocolBuffers_iOS.xcodeproj/xcuserdata/