summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-30 15:33:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-30 15:33:14 -0700
commit91863750cd09c3da93368d8fc6d3caeaabf1d66a (patch)
treed69a649c02ba516e82197b9f7f2f3330b11aa87a /ll-merge.h
parentcheck-ignore doc: fix broken link to ls-files page (diff)
parentimap-send: eliminate HMAC deprecation warnings on Mac OS X (diff)
downloadtgif-91863750cd09c3da93368d8fc6d3caeaabf1d66a.tar.xz
Merge branch 'da/darwin' into maint
Newer MacOS X encourages the programs to compile and link with their CommonCrypto, not with OpenSSL. * da/darwin: imap-send: eliminate HMAC deprecation warnings on Mac OS X cache.h: eliminate SHA-1 deprecation warnings on Mac OS X Makefile: add support for Apple CommonCrypto facility Makefile: fix default regex settings on Darwin
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions