Merge branch 'maint'
commit566f5b217df73d6a642a0857cc5c13c11f84e7c3
authorJunio C Hamano <junkio@cox.net>
Thu, 12 Apr 2007 01:43:01 +0000 (11 18:43 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 12 Apr 2007 01:43:01 +0000 (11 18:43 -0700)
treeff172bf2658ca4e1f4c88d30bb80c8af17f29b2d
parentb06dcf8cb83a9b7655bad5f0f6d84e68fc78beb3
parent9b11d24d4156e0b2246383faad16eb8aa0caeefb
Merge branch 'maint'

* maint:
  GIT 1.5.1.1
  cvsserver: Fix handling of diappeared files on update
  fsck: do not complain on detached HEAD.
  (encode_85, decode_85): Mark source buffer pointer as "const".
builtin-fsck.c
cache.h