Merge branch 'maint-1.6.6' into maint
commit8165952517bf82b6a632cefc047ad14f36a74b25
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Apr 2010 08:28:27 +0000 (19 01:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Apr 2010 08:28:27 +0000 (19 01:28 -0700)
tree22c79015535b9407a5a83ab49b454650d780b763
parent03aa87ed9912a6beac1a23e69ef0b70e1589d3d0
parentb75686455c0524f167b6a878c124df40db34b325
Merge branch 'maint-1.6.6' into maint

* maint-1.6.6:
  MSVC: Fix build by adding missing termios.h dummy