Andrew's git / gitweb.git / diff
?
Merge branch 'sk/mingw-main'
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Jul 2014 18:34:22 +0000 (11:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Jul 2014 18:34:22 +0000 (11:34 -0700)
* sk/mingw-main:
mingw: avoid const warning
Win32: move main macro to a function

Trivial merge