Merge branch 'md/interix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:34 +0000 (17:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:34 +0000 (17:52 -0800)
commitec3f7d5d0f3676aa9634ee30f8c9e55893a8c505
treeb51c8a2a902b671d0336a61276c0ae8f9b423836
parent1aa6583cc257f3b0570cbc25c89a54f0e4417ef6
parent25fe66f84cea9c2e0a7f6b53180542784b94485a
Merge branch 'md/interix'

* md/interix:
  Interix: add configure checks
  add support for the SUA layer (interix; windows)

Conflicts:
git-compat-util.h
Makefile
daemon.c
git-compat-util.h