Merge tag 'post183-for-junio' of http://github.com/msysgit/git
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Jun 2013 14:38:37 +0000 (07:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Jun 2013 14:38:37 +0000 (07:38 -0700)
Collected msysgit build patches for upstream

This set of patches collects a number of build fixes that have been
used on the msysgit port for a while and merging upstream should
simplify future maintenance.

* tag 'post183-for-junio' of http://github.com/msysgit/git:
Set the default help format to html for msys builds.
Ensure the resource file is rebuilt when the version changes.
Windows resource: handle dashes in the Git version gracefully
Provide a Windows version resource for the git executables.
msysgit: Add the --large-address-aware linker directive to the makefile.
Define NO_GETTEXT for Git for Windows
Makefile: Do not use OLD_ICONV on MINGW anymore

1  2 
Makefile
diff --cc Makefile
Simple merge