Merge branch 'np/pack'
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Nov 2007 08:11:17 +0000 (01:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Nov 2007 08:11:17 +0000 (01:11 -0700)
commite091653951ae516a923338874bfe550894cd1bc9
treee9620973ebe58be7edfb13e5df57f8e7262ce851
parent2dfffd3e09b2541b1bfcc840a65eac0251832175
parent79814f425c00129dbdbdc3c99d04af52ccc58254
Merge branch 'np/pack'

* np/pack:
  pack-objects: get rid of an ugly cast
  make the pack index version configurable

Conflicts:

builtin-pack-objects.c
builtin-pack-objects.c
index-pack.c