Merge branch 'rj/maint-simplify-cygwin-makefile' into maint
commitc206224b2b7a32924c40b162c59329da143aba1f
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:51:16 +0000 (3 13:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:51:16 +0000 (3 13:51 -0800)
tree7a50318317f150f045727d5703677e59c7c305fe
parentdc733ef4190dffcbcd5c1c27569fecf01f9a44bd
parent035b76b03f63e077e3465a99bee5dffa29822344
Merge branch 'rj/maint-simplify-cygwin-makefile' into maint

* rj/maint-simplify-cygwin-makefile:
  Makefile: merge two Cygwin configuration sections into one
Makefile