Merge branch 'master' into js/merge-base
commitf23c75a8eca5eeabf9aaf303ee7e14a94da42ddc
authorJunio C Hamano <junkio@cox.net>
Mon, 3 Jul 2006 10:14:32 +0000 (3 03:14 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 3 Jul 2006 10:16:52 +0000 (3 03:16 -0700)
treee8379d2e091dcdabb623ebbe8b7a1ee53be308a9
parent160b7983034cdd24ea1bf6ef7a2532a2296461c6
parent8fced61cbc32f0c4b81a3dcecfeb40b7d96339ce
Merge branch 'master' into js/merge-base

This is to pull in the object-hash clean-up from the master branch.
object.c
object.h
revision.c