From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Nov 2011 19:30:02 +0000 (-0800)
Subject: Sync with 1.7.7.4
X-Git-Tag: v1.7.8-rc4~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4c00c852b3f2596f246811ca933eef357183581b;p=git.git

Sync with 1.7.7.4
---

4c00c852b3f2596f246811ca933eef357183581b
diff --cc Makefile
index ee34eab8c,5dbe4f790..34ac79578
--- a/Makefile
+++ b/Makefile
@@@ -515,9 -519,9 +515,10 @@@ LIB_H += compat/mingw.
  LIB_H += compat/obstack.h
  LIB_H += compat/win32/pthread.h
  LIB_H += compat/win32/syslog.h
 -LIB_H += compat/win32/sys/poll.h
 +LIB_H += compat/win32/poll.h
  LIB_H += compat/win32/dirent.h
 +LIB_H += connected.h
+ LIB_H += convert.h
  LIB_H += csum-file.h
  LIB_H += decorate.h
  LIB_H += delta.h