Merge branch 'ph/enable-threaded' into next
commitd38bbd738326ec38a3992ac1e237e637407ff272
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Aug 2008 00:07:27 +0000 (17 17:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Aug 2008 00:07:27 +0000 (17 17:07 -0700)
tree8d434d2eff6e06b35c0da211aa104cd0913a3be0
parent2ebc02d32a4360da2cf69c2b5f5bfad0716d42b0
parent38bd64979a2a3ffa178af801c6a62e6fcd658274
Merge branch 'ph/enable-threaded' into next

* ph/enable-threaded:
  Enable threaded delta search on *BSD and Linux.
Makefile