Merge branch 'vr/msvc' into next
commitf46d021c968776eec17e5274c2b250b0b4f064b9
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Nov 2011 23:01:52 +0000 (14 15:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Nov 2011 23:01:52 +0000 (14 15:01 -0800)
tree3e8e84669ea1bb100921d4ca94d70c7057a565af
parent72bb2d5b6710462dbf2e8d479ac63e2a74695332
parent439fbb807259ad52f1af86ca5e5c98b5f189a246
Merge branch 'vr/msvc' into next

* vr/msvc:
  MSVC: Remove unneeded header stubs
  Compile fix for MSVC: Include <io.h>
  Compile fix for MSVC: Do not include sys/resources.h