diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2015-05-26 12:31:13 -0400 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2015-05-26 14:01:54 -0400 |
commit | 58cd4a47e823645414348acbd8f963f7e713b2fa (patch) | |
tree | afeed28fdefcdad822152af40adac664cf67f0ff /.gitignore | |
parent | 8e1426800e8332bcdfa9f29eb0db41d3a565b598 (diff) | |
download | protobuf-58cd4a47e823645414348acbd8f963f7e713b2fa.tar.gz protobuf-58cd4a47e823645414348acbd8f963f7e713b2fa.tar.bz2 protobuf-58cd4a47e823645414348acbd8f963f7e713b2fa.zip |
ObjC fixup for the branch.
- Shouldn't need SRCROOT in the project since Xcode should be setting the working directory to where the project lives.
- Remove the packed/unpacked repeated enum field in the tests and update the code to handle the defaults.
- Move up the ignore to cover .DS_Store files in src also.
add starstar
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -92,7 +92,8 @@ objectivec/ProtocolBuffers_OSX.xcodeproj/xcuserdata/ objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcuserdata/ objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/ProtocolBuffers_iOS.xccheckout objectivec/ProtocolBuffers_iOS.xcodeproj/xcuserdata/ -objectivec/**/.DS_Store +# OS X's Finder creates these for state about opened windows/etc. +**/.DS_Store # Comformance test output conformance/.libs/ |