diff options
| author | Paul Yang <TeBoring@users.noreply.github.com> | 2015-05-24 00:35:56 -0700 |
|---|---|---|
| committer | Paul Yang <TeBoring@users.noreply.github.com> | 2015-05-24 00:35:56 -0700 |
| commit | 8ee267dda7084db25065619620bfec4a1eee326a (patch) | |
| tree | 9f022bd58de6dd3f6181c74b1790c5034369dbc6 /.gitignore | |
| parent | a7393c0b26646de93ddc7128bcd8a26b79f0dd53 (diff) | |
| parent | f87e5b7e74d693387f140882a427c152e85592b1 (diff) | |
| download | protobuf-8ee267dda7084db25065619620bfec4a1eee326a.tar.gz protobuf-8ee267dda7084db25065619620bfec4a1eee326a.tar.bz2 protobuf-8ee267dda7084db25065619620bfec4a1eee326a.zip | |
Merge pull request #420 from TeBoring/3.0.0-alpha-3-fix
Fix C2385: ambiguous access to parent classes' member without specifying
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -90,3 +90,12 @@ objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcuserdata/ objectivec/ProtocolBuffers_OSX.xcodeproj/xcuserdata/ objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcuserdata/ objectivec/ProtocolBuffers_iOS.xcodeproj/xcuserdata/ + +# Comformance test output +conformance/.libs/ +conformance/com/ +conformance/conformance-cpp +conformance/conformance-test-runner +conformance/conformance.pb.cc +conformance/conformance.pb.h +conformance/protoc_middleman |