summaryrefslogtreecommitdiff
path: root/diffcore-break.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-02 15:55:48 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-02 15:55:48 -0700
commit527b1719f583ed56653b6d296422968e86f62d59 (patch)
tree7f1b0a50ea5eec3d3a56cfd914f7a18541f09d1f /diffcore-break.c
parent29d5350c0115d8847d010830b0dcca429b038e31 (diff)
parentbe4c828b761a7c65edcff75b008051b6d027e64a (diff)
downloadgit-527b1719f583ed56653b6d296422968e86f62d59.tar.gz
Merge branch 'da/darwin'
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 'diffcore-break.c')
0 files changed, 0 insertions, 0 deletions