Merge branch 'js/maint-no-ln-across-libexec-and-bin' into maint
commit2a1feb92ee58770670e6b82992d29cbc5d6f04aa
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:04:29 +0000 (25 19:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:04:29 +0000 (25 19:04 -0700)
tree68feda81211ff3b0fc0599d7530f9057261d0a62
parent5e04a1ee33f82051668f09d73cf16348169e7f1f
parent3426e34feddf97085615e619d39f8173ff3f9fb4
Merge branch 'js/maint-no-ln-across-libexec-and-bin' into maint

* js/maint-no-ln-across-libexec-and-bin:
  Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile

Conflicts:
Makefile
Makefile