Merge branch 'master' of https://github.com/google/flatbuffers into fuzzer2
authorWouter van Oortmerssen <wvo@google.com>
Wed, 8 Jun 2016 18:51:49 +0000 (11:51 -0700)
committerWouter van Oortmerssen <wvo@google.com>
Wed, 8 Jun 2016 18:51:49 +0000 (11:51 -0700)
1  2 
include/flatbuffers/flatbuffers.h
tests/test.cpp

Simple merge
diff --cc tests/test.cpp
Simple merge