Merge branch 'js/mingw-host-cpu'
commit8593e8a61807df2579b9e578d46e2285b47b61a7
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 02:18:43 +0000 (13 18:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 02:18:43 +0000 (13 18:18 -0800)
tree49de428edbb7b6693c4a74adcbff41ab9309389f
parentfeb9a9b202c12289150de45473846f4272aac1bd
parentbb02e7a560de818eac48344717bc52ca51b01908
Merge branch 'js/mingw-host-cpu'

Windows update.

* js/mingw-host-cpu:
  mingw: use a more canonical method to fix the CPU reporting
compat/mingw.h
config.mak.uname