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)
commit5e3f9d51754e746c6a17e037fd428d265d89027e
tree79363d4664af64b8b7172fb402365261854f3cf4
parente98b1912b356f1e8a19245979eeb979628c62c87
parentcdc5d5b18debcba278aa6e6eac000c0555e72bd8
Merge branch 'master' of https://github.com/google/flatbuffers
CMakeLists.txt
include/flatbuffers/flatbuffers.h
include/flatbuffers/idl.h