| commit | 9a7eaad65ff5f6bf5c7fda427bcc2b94f6ada598 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 4 Sep 2013 19:28:15 +0000 (4 12:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 4 Sep 2013 19:28:15 +0000 (4 12:28 -0700) | ||
| tree | e81115c0c556a4f5d4d72b61c20150bb2a0ba402 | treesnapshot (tar.gz zip) |
| parent | 4aa04a8f8d8cac0e0fb61251fbc71f292d4ab801 | commitdiff |
| parent | f2be034c6918e7f5d42da5ad1cf9d3ef51c25a77 | commitdiff |
Merge branch 'da/darwin'
* da/darwin:
OS X: Fix redeclaration of die warning
Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1
imap-send: use Apple's Security framework for base64 encoding
* da/darwin:
OS X: Fix redeclaration of die warning
Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1
imap-send: use Apple's Security framework for base64 encoding
| Makefile | diff1 | diff2 | blobhistory |
| git-compat-util.h | diff1 | diff2 | blobhistory |