Merge branch 'js/mingw-host-cpu'
commit6951c5fd9fc221520b80de1da340918887f5803b
authorJunio C Hamano <gitster@pobox.com>
Sat, 9 Feb 2019 04:44:53 +0000 (8 20:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 9 Feb 2019 04:44:53 +0000 (8 20:44 -0800)
treef36bee25bcb4b413a47194832743853ed2ba17a9
parent8f6399eceec47de2887a621ca6ee01a3ef8b3f56
parent3815f64b0dd983bdbf9242a0547706d5d81cb3e6
Merge branch 'js/mingw-host-cpu'

Windows update.

* js/mingw-host-cpu:
  mingw: fix CPU reporting in `git version --build-options`
compat/mingw.h