Andrew's git / gitweb.git / diff
?
Merge branch 'ls/macos-update'
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Nov 2016 21:56:30 +0000 (13:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Nov 2016 21:56:30 +0000 (13:56 -0800)
Portability update and workaround for builds on recent Mac OS X.

* ls/macos-update:
travis-ci: disable GIT_TEST_HTTPD for macOS
Makefile: set NO_OPENSSL on macOS by default

No differences found