Merge branch 'rj/maint-simplify-cygwin-makefile'
authorJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2009 07:47:43 +0000 (23:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2009 07:47:43 +0000 (23:47 -0800)
* rj/maint-simplify-cygwin-makefile:
  Makefile: merge two Cygwin configuration sections into one

1  2 
Makefile

diff --cc Makefile
Simple merge