Andrew's git / gitweb.git / diff
?
Merge branch 'da/darwin'
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 Sep 2013 19:28:15 +0000 (12:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Sep 2013 19:28:15 +0000 (12:28 -0700)
* 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

1  2 
Makefile patch | diff1 | diff2 | blob | history
git-compat-util.h patch | diff1 | diff2 | blob | history
diff --cc Makefile
Simple merge
diff --cc git-compat-util.h
Simple merge