]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'rj/mingw-cygwin'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:30:20 +0000 (13:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:30:20 +0000 (13:30 -0700)
Update build for Cygwin 1.[57].  Torsten Bögershausen reports that
this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it
ahead.

* rj/mingw-cygwin:
  cygwin: Remove the CYGWIN_V15_WIN32API build variable
  mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE

1  2 
Makefile
config.mak.uname
git-compat-util.h
help.c
test-chmtime.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
diff --cc help.c
Simple merge
diff --cc test-chmtime.c
Simple merge