Merge branch 'master' of https://github.com/google/flatbuffers into grpc2

This commit is contained in:
Wouter van Oortmerssen
2016-07-20 17:41:36 -07:00
36 changed files with 751 additions and 102 deletions

5
.gitignore vendored
View File

@@ -57,9 +57,10 @@ build/Xcode/FlatBuffers.xcodeproj/xcuserdata/**
FlatBuffers.xcodeproj/
java/.idea
java/*.iml
java/target
**/*.pyc
.idea
*.iml
target
**/*.pyc
build/VS2010/FlatBuffers.sdf
build/VS2010/FlatBuffers.opensdf
build/VS2010/ipch/**/*.ipch