Merge branch 'ew/daemon-socket-keepalive' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:21:37 +0000 (14:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:21:37 +0000 (14:21 -0700)
commit172b811...22e30ecb3cd660319890e41bc40006bc
tree69c96d5...a70cc4d53dbecee794cb8a09dfad449fcopy hash to clipboard (tree)
parentaa9136a...7e3ce299fe966da4686a571d6a528311copy hash to clipboard (diff)
parentfab6027...800efba101b3f08a297639d14ecbf840copy hash to clipboard (diff)
compat/mingw.h