::: Net-SNMP: merging V5-7-patches into master
Auto-merging configure
Auto-merging include/net-snmp/net-snmp-config.h.in
Auto-merging snmplib/transports/snmpUDPIPv4BaseDomain.c
Auto-merging win32/net-snmp/net-snmp-config.h
Auto-merging win32/net-snmp/net-snmp-config.h.in
Merge made by recursive.
 ChangeLog                                  |11300 ++++++++++++++++++++++++++++
 FAQ                                        |    2 +-
 README                                     |    2 +-
 agent/Makefile.depend                      |  429 +-
 agent/helpers/Makefile.depend              |  167 -
 agent/mibgroup/Makefile.depend             | 1324 +---
 apps/Makefile.depend                       |  271 +-
 apps/snmpnetstat/Makefile.depend           |   60 +-
 configure                                  |   48 +-
 configure.ac                               |    2 +-
 configure.d/config_os_struct_members       |    3 +-
 dist/Makefile                              |    2 +-
 dist/net-snmp.spec                         |    2 +-
 include/net-snmp/net-snmp-config.h.in      |    3 +
 snmplib/Makefile.depend                    |  831 +--
 snmplib/transports/snmpUDPBaseDomain.c     |    3 +-
 snmplib/transports/snmpUDPDomain.c         |    3 +-
 snmplib/transports/snmpUDPIPv4BaseDomain.c |    3 +-
 win32/net-snmp/net-snmp-config.h           |    5 +-
 win32/net-snmp/net-snmp-config.h.in        |    5 +-
 20 files changed, 11835 insertions(+), 2630 deletions(-)