Merge branch 'ew/daemon-socket-keepalive'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 17:34:43 +0000 (10:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 17:34:43 +0000 (10:34 -0700)
commitb48dfd8...c90cae3f98dca01101b7e298c0192d16
tree4e2ab2b...811d0fc44449153e0034ae8897a80797copy hash to clipboard (tree)
parentad2d777...0434e1650c186c71fa04a8fdbd77266ccopy hash to clipboard (diff)
parentfab6027...800efba101b3f08a297639d14ecbf840copy hash to clipboard (diff)
compat/mingw.h
daemon.c