Merge pull request #1101 from fbenkstein/vs2010
authorNico Weber <nicolasweber@gmx.de>
Fri, 5 Feb 2016 16:39:40 +0000 (11:39 -0500)
committerNico Weber <nicolasweber@gmx.de>
Fri, 5 Feb 2016 16:39:40 +0000 (11:39 -0500)
commita4d4787de199694d3d36f50bf18d82a9124d4b03
treea896238d18f18e3cc97ece6313c042bd29089b42
parent8028e91a9dc90b51b4da7ded70cc38234ed62451
parentab652787de83d94af71711ae211c4223958457c4
Merge pull request #1101 from fbenkstein/vs2010

disable warning about conditional expressions