diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2014-08-20 20:22:21 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2014-08-20 20:22:21 +0100 |
| commit | a1bccd48f3956b50a13a34f5aed4b72c658c61af (patch) | |
| tree | c2f216cea6f67db514741d89631ef11aa25abc09 /src/OS/Makefile-Base | |
| parent | d8129d876786c938f06dfbe91e51ebe36f09ae43 (diff) | |
| parent | a7538db17824b7fd70c12ef7561a67b85d6f247e (diff) | |
Merge branch 'master' into dane
Conflicts:
doc/doc-txt/ChangeLog
src/src/tls-openssl.c
src/src/transports/smtp.c
src/src/verify.c
Diffstat (limited to 'src/OS/Makefile-Base')
0 files changed, 0 insertions, 0 deletions