Merge pull request #602 from chrisstaite/master
authorWouter van Oortmerssen <wvo@google.com>
Mon, 30 Nov 2015 20:21:41 +0000 (12:21 -0800)
committerWouter van Oortmerssen <wvo@google.com>
Mon, 30 Nov 2015 20:21:41 +0000 (12:21 -0800)
Fix flatbuffers::String to std::string and import of Windows.h

1  2 
include/flatbuffers/flatbuffers.h

Simple merge