diff options
author | Erlang/OTP <[email protected]> | 2012-01-27 11:34:41 +0100 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2012-01-27 11:34:41 +0100 |
commit | b16baad540d35b890c0c6baf9a1be2a90ea96239 (patch) | |
tree | 4b3249ae0822213e59d7bd371ebe09d6eda32246 /erts/Makefile.in | |
parent | e0e862b42d508b5112395f41584bed90c74a8a92 (diff) | |
parent | 980c05769a4146197e5eb0175c6ffacbf4d5634c (diff) | |
download | otp-b16baad540d35b890c0c6baf9a1be2a90ea96239.tar.gz otp-b16baad540d35b890c0c6baf9a1be2a90ea96239.tar.bz2 otp-b16baad540d35b890c0c6baf9a1be2a90ea96239.zip |
Merge branch 'bmk/snmp/snmp4174_integration/r13' into maint-r13
* bmk/snmp/snmp4174_integration/r13:
[snmp/agent] Add proper release notes
[snmp/agent] Wrong OID used for error message reply
[snmp/agent] Added backup check for local_db
[snmp/agent] Simultaneous snmpa:backup/1,2 calls interfere
Diffstat (limited to 'erts/Makefile.in')
0 files changed, 0 insertions, 0 deletions