diff options
| author | Jan Tattermusch <jtattermusch@google.com> | 2015-05-13 13:35:02 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-05-13 13:35:02 -0700 |
| commit | 41113108303afbc1458c1c82b267cc17703ea8ce (patch) | |
| tree | 70ee5f7e6d383fbc5f125daf1b54e1e0766ab1b1 /.gitignore | |
| parent | 3bc162a8ace489bc8a62c5e715f7bf673bd8db75 (diff) | |
| parent | 23bb79d4a32a77e8349d6c49052be1e56a8b8153 (diff) | |
| download | protobuf-41113108303afbc1458c1c82b267cc17703ea8ce.tar.gz protobuf-41113108303afbc1458c1c82b267cc17703ea8ce.tar.bz2 protobuf-41113108303afbc1458c1c82b267cc17703ea8ce.zip | |
Merge branch 'master' of github.com:google/protobuf into integrate_from_master
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -51,6 +51,7 @@ cpp_test*.pb.* *.pyc *.egg-info *_pb2.py +python/*.egg python/.eggs/ python/build/ python/google/protobuf/compiler/ @@ -82,3 +83,9 @@ vsprojects/Release # 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/ |