| commit | 1b84458321fa219b0d416c154053bf08c23aeb99 | [log] [tgz] |
|---|---|---|
| author | Bart Van Assche <bvanassche@acm.org> | Sat Sep 28 10:53:09 2013 +0200 |
| committer | Bart Van Assche <bvanassche@acm.org> | Sat Sep 28 10:53:09 2013 +0200 |
| tree | 6eb23a96394e01205300142d900e77154caf7fc2 | |
| parent | 3dde41998625fe0e24119a2e1f4509ba3ba2fd9a [diff] | |
| parent | e7f944cf7730f6a71d74b24553692a06d82c8769 [diff] |
Merge branch 'V5-5-patches' into V5-6-patches * V5-5-patches: CHANGES: snmplib: Rename memdup() into netsnmp_memdup() Conflicts: agent/helpers/old_api.c agent/helpers/table_dataset.c include/net-snmp/library/tools.h man/netsnmp_util.3 snmplib/snmptsm.c snmplib/snmpusm.c win32/libsnmp_dll/libsnmp.def