diff options
author | Micael Karlberg <[email protected]> | 2011-04-08 11:29:49 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-04-08 11:29:49 +0200 |
commit | bb6e729795ebf3dddfcfd7182384bda59e9f6a94 (patch) | |
tree | 832f365ee638ffb0525dfe45ebaf75c1df5e9a9a /lib | |
parent | c7022587ac4974dc13403e8493a9885e32f44e7b (diff) | |
parent | 057911fd21db849ff4f6a9fa28674002945f725f (diff) | |
download | otp-bb6e729795ebf3dddfcfd7182384bda59e9f6a94.tar.gz otp-bb6e729795ebf3dddfcfd7182384bda59e9f6a94.tar.bz2 otp-bb6e729795ebf3dddfcfd7182384bda59e9f6a94.zip |
Merge branch 'bmk/snmp/snmp420_integration' of super:bmk_otp into bmk/snmp/snmp420_integration
Diffstat (limited to 'lib')
-rw-r--r-- | lib/snmp/src/misc/snmp_misc.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/snmp/src/misc/snmp_misc.erl b/lib/snmp/src/misc/snmp_misc.erl index 2dce76992b..6adef06ab9 100644 --- a/lib/snmp/src/misc/snmp_misc.erl +++ b/lib/snmp/src/misc/snmp_misc.erl @@ -40,7 +40,7 @@ get_option/2, get_option/3, get_sec_level/1, - ip/1, + ip/1, ip/2, is_auth/1, is_BitString/1, is_oid/1, |