diff options
| author | Björn Gustavsson <[email protected]> | 2010-08-25 11:24:24 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-08-25 11:24:24 +0200 |
| commit | 1b4a6172d8d2df4362d6d084daef02804e10ebb6 (patch) | |
| tree | bebdac2e98dc989b17f2fdf85b996f2454689e04 /lib/snmp/vsn.mk | |
| parent | 3f11eeaaedf24d15c3a6e8cb19d8421e57d14962 (diff) | |
| parent | 6c00708e21bccffff84595f714cf9c1003cc8916 (diff) | |
| download | otp-1b4a6172d8d2df4362d6d084daef02804e10ebb6.tar.gz otp-1b4a6172d8d2df4362d6d084daef02804e10ebb6.tar.bz2 otp-1b4a6172d8d2df4362d6d084daef02804e10ebb6.zip | |
Merge branch 'maint-r13' into dev
* maint-r13:
snmp: Patch 1130
inets: Patch 1129
ssh: Patch 1127
ssh: Patch 1126
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
lib/inets/vsn.mk
lib/snmp/vsn.mk
lib/ssh/doc/src/notes.xml
lib/ssh/src/ssh.appup.src
lib/ssh/vsn.mk
Diffstat (limited to 'lib/snmp/vsn.mk')
| -rw-r--r-- | lib/snmp/vsn.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk index f4648e8ff5..21b84f0dc6 100644 --- a/lib/snmp/vsn.mk +++ b/lib/snmp/vsn.mk @@ -1,22 +1,22 @@ #-*-makefile-*- ; force emacs to enter makefile-mode # %CopyrightBegin% -# +# # Copyright Ericsson AB 1997-2010. All Rights Reserved. -# +# # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in # compliance with the License. You should have received a copy of the # Erlang Public License along with this software. If not, it can be # retrieved online at http://www.erlang.org/. -# +# # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See # the License for the specific language governing rights and limitations # under the License. -# +# # %CopyrightEnd% -SNMP_VSN = 4.17 +SNMP_VSN = 4.17.1 PRE_VSN = APP_VSN = "snmp-$(SNMP_VSN)$(PRE_VSN)" |