diff options
author | Micael Karlberg <[email protected]> | 2012-02-06 14:30:20 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2012-02-06 14:30:20 +0100 |
commit | 2d97f0e5f13bf22d92dbc6df18787581eb462c41 (patch) | |
tree | bac265730b859dc87f0467464be4cd142098c4ef /lib/snmp/vsn.mk | |
parent | ab2ba6f1b0713fbe5c78f67aeefb73ffc006e995 (diff) | |
parent | 0c9547c384ba9d299d4a73bdf2a514c2b47128cd (diff) | |
download | otp-2d97f0e5f13bf22d92dbc6df18787581eb462c41.tar.gz otp-2d97f0e5f13bf22d92dbc6df18787581eb462c41.tar.bz2 otp-2d97f0e5f13bf22d92dbc6df18787581eb462c41.zip |
Merge branch 'maint-r15' into maint
Conflicts:
erts/vsn.mk
Diffstat (limited to 'lib/snmp/vsn.mk')
-rw-r--r-- | lib/snmp/vsn.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk index 1fbad654f7..fb1dcb6c41 100644 --- a/lib/snmp/vsn.mk +++ b/lib/snmp/vsn.mk @@ -18,7 +18,6 @@ # %CopyrightEnd% APPLICATION = snmp -SNMP_VSN = 4.21.6 +SNMP_VSN = 4.21.7 PRE_VSN = APP_VSN = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)" - |