| commit | 27a4797c6411f4a23e35b8af5cac04c132556591 | [log] [tgz] |
|---|---|---|
| author | Bart Van Assche <bvanassche@acm.org> | Sun Dec 15 09:37:21 2013 +0100 |
| committer | Bart Van Assche <bvanassche@acm.org> | Sun Dec 15 09:37:21 2013 +0100 |
| tree | 61542e5f2ea1b83b3146a747546f940698309fd4 | |
| parent | e0ead2d54ebf43533e562c3402e12188cfdc079e [diff] | |
| parent | 13c8590e38269a9265ead5c85f05c8894e86d84c [diff] |
Merge branch 'V5-6-patches' into V5-7-patches * V5-6-patches: Remove the NETSNMP_DONTWAIT / NETSNMP_NOSIGNAL aliases for sendto/sendmsg flags Conflicts: include/net-snmp/library/snmpUDPBaseDomain.h snmplib/transports/snmpDTLSUDPDomain.c snmplib/transports/snmpUDPBaseDomain.c