Merge branch 'lt/diffgen' into next
commitac93bfc3b64a8a3756263ecdadad3e7a117be597
authorJunio C Hamano <junkio@cox.net>
Mon, 27 Mar 2006 07:44:28 +0000 (26 23:44 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 27 Mar 2006 07:44:28 +0000 (26 23:44 -0800)
tree83ee665768a654e556684fcf1d8a25b09819aaec
parentd93067d9c7fb210766c7282d662289f54d53f93a
parent3467fec516e0549cfe7ae3ed8bd981a7e5f528f4
Merge branch 'lt/diffgen' into next

* lt/diffgen:
  add clean and ignore rules for xdiff/
  Remove dependency on a file named "-lz"
Makefile