From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Jun 2013 20:30:20 +0000 (-0700)
Subject: Merge branch 'rj/mingw-cygwin'
X-Git-Tag: v1.8.4-rc0~192
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e936318aa61760a8fe02557bd3c241136613fb34?ds=inline;hp=--cc

Merge branch 'rj/mingw-cygwin'

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
---

e936318aa61760a8fe02557bd3c241136613fb34