Merge branch 'mr/hpux'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 21:21:47 +0000 (14:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 21:21:47 +0000 (14:21 -0700)
* mr/hpux:
  git-compat-util.h: Honor HP C's noreturn attribute
  Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section

1  2 
Makefile
git-compat-util.h

diff --cc Makefile
Simple merge
Simple merge