Merge branch 'master' of https://github.com/google/flatbuffers (dc38f93c) · Commits · fuchsia-mirror / fuchsia.googlesource.com-third_party-flatbuffers · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

F

fuchsia.googlesource.com-third_party-flatbuffers
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

dc38f93c

Commit dc38f93c authored 8 years ago by Wouter van Oortmerssen

Downloads
- Plain Diff

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

parents f9025eeb 199157e8

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 4 additions, 1 deletion

CMakeLists.txt
include/flatbuffers/flatbuffers.h 1 addition, 1 deletion

include/flatbuffers/flatbuffers.h
net/FlatBuffers/FlatBuffers.csproj 1 addition, 0 deletions

net/FlatBuffers/FlatBuffers.csproj
src/idl_gen_cpp.cpp 18 additions, 1 deletion

src/idl_gen_cpp.cpp
src/idl_gen_general.cpp 10 additions, 2 deletions

src/idl_gen_general.cpp
src/idl_parser.cpp 6 additions, 3 deletions

src/idl_parser.cpp
tests/MyGame/Example2/Monster.cs 2 additions, 2 deletions

tests/MyGame/Example2/Monster.cs
tests/monster_test.bfbs 0 additions, 0 deletions

tests/monster_test.bfbs
tests/monster_test_generated.h 16 additions, 0 deletions

tests/monster_test_generated.h
tests/namespace_test/NamespaceA/TableInFirstNS.cs 2 additions, 2 deletions

tests/namespace_test/NamespaceA/TableInFirstNS.cs
tests/namespace_test/NamespaceC/TableInC.cs 6 additions, 6 deletions

tests/namespace_test/NamespaceC/TableInC.cs
tests/namespace_test/NamespaceC/TableInC.java 2 additions, 2 deletions

tests/namespace_test/NamespaceC/TableInC.java
tests/test.cpp 9 additions, 1 deletion

tests/test.cpp

with 77 additions and 21 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment