Merge branch 'sk/mingw-main'

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

Junio C Hamano committed Jul 9, 2014 at 11:34 UTC ba655d15b58ab2a00032b74e5b2617a0b658a01f

No changes.