projects / platform / upstream / flatbuffers.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e98b191 cdc5d5b)
Merge branch 'master' of https://github.com/google/flatbuffers
authorWouter van Oortmerssen <wvo@google.com>
Mon, 4 Apr 2016 23:55:25 +0000 (16:55 -0700)
committerWouter van Oortmerssen <wvo@google.com>
Mon, 4 Apr 2016 23:55:25 +0000 (16:55 -0700)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
include/flatbuffers/flatbuffers.h patch | diff1 | diff2 | blob | history
include/flatbuffers/idl.h patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
diff --cc include/flatbuffers/flatbuffers.h
Simple merge
diff --cc include/flatbuffers/idl.h
Simple merge
Domain: Machine Learning / ML Framework;