diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:32:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:32:18 -0800 |
| commit | 740b6ad75bbe0cd0c3f4be30f0380814878ac445 (patch) | |
| tree | 8f0e6726178c2d6ffc9cbadc204a034b892fb464 /builtin-merge.c | |
| parent | Merge branch 'jk/maint-push-config' (diff) | |
| parent | imap-send.c: fix compiler warnings for OpenSSL 1.0 (diff) | |
| download | git-740b6ad75bbe0cd0c3f4be30f0380814878ac445.tar.gz git-740b6ad75bbe0cd0c3f4be30f0380814878ac445.zip | |
Merge branch 'vl/maint-openssl-signature-change'
* vl/maint-openssl-signature-change:
imap-send.c: fix compiler warnings for OpenSSL 1.0
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions