Merge branch 'rj/cygwin-msvc'
authorJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2009 07:48:11 +0000 (23:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2009 07:48:11 +0000 (23:48 -0800)
* rj/cygwin-msvc:
  MSVC: Add support for building with NO_MMAP
  Makefile: keep MSVC and Cygwin configuration separate

1  2 
Makefile
compat/mingw.h

diff --cc Makefile
Simple merge
diff --cc compat/mingw.h
Simple merge