Merge pull request #1003 from sgraham/2015-compile
authorNico Weber <nicolasweber@gmx.de>
Mon, 10 Aug 2015 15:35:33 +0000 (08:35 -0700)
committerNico Weber <nicolasweber@gmx.de>
Mon, 10 Aug 2015 15:35:33 +0000 (08:35 -0700)
commit30d1d7b8da64ff5f32b46aa704f9fbc324c71949
tree08be2bf79a4ab46b064eedbd2055821f6f640917
parentddc1777449208ace6f494277c329ebd84671f4b5
parent956b4f1bc4f276325fd3ad8670be6bc9c9804fb9
Merge pull request #1003 from sgraham/2015-compile

Fix compile on VS2015