projects / platform / upstream / flatbuffers.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad3fd6e 622b8d0)
Merge branch 'master' of https://github.com/google/flatbuffers
authorAmol Deshpande <amol.deshpande@outlook.com>
Tue, 16 Jun 2015 14:16:59 +0000 (07:16 -0700)
committerAmol Deshpande <amol.deshpande@outlook.com>
Tue, 16 Jun 2015 14:16:59 +0000 (07:16 -0700)
Conflicts:
src/flatc.cpp
src/idl_gen_general.cpp


Trivial merge
Domain: Machine Learning / ML Framework;