Merge pull request #1252 from alesliehughes/master
authorZoltan Varga <vargaz@gmail.com>
Wed, 3 Sep 2014 18:44:32 +0000 (14:44 -0400)
committerZoltan Varga <vargaz@gmail.com>
Wed, 3 Sep 2014 18:44:32 +0000 (14:44 -0400)
commit4c1155f40a5fc575419594049601ba2f09915eb8
tree268b0c5b71019e036520a1a3067b1dd2c3d210d9
parentf9b27e2e7383bd8c2064a38c64bbb6f6ef40ef56
parentec2b629fa9c15f7f2631651972e5f4fe87ef5f18
Merge pull request #1252 from alesliehughes/master

Stop warning about winsock2.h being included before windows.h