From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Jul 2014 18:34:22 +0000 (-0700)
Subject: Merge branch 'sk/mingw-main'
X-Git-Tag: v2.1.0-rc0~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba655d15b58ab2a00032b74e5b2617a0b658a01f;p=thirdparty%2Fgit.git

Merge branch 'sk/mingw-main'

* sk/mingw-main:
  mingw: avoid const warning
  Win32: move main macro to a function
---

ba655d15b58ab2a00032b74e5b2617a0b658a01f