diff options
author | Ingela Anderton Andin <[email protected]> | 2017-04-04 16:44:13 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2017-04-04 17:18:22 +0200 |
commit | fbe1980e5ca85e516648420e0fed0d00b20a0529 (patch) | |
tree | 76047c17f037a01d8447f8fd2e5e204d134a141a /lib/inets/vsn.mk | |
parent | eaf6a1477c4cd812eb31814cc09bdf14c796a9ba (diff) | |
parent | c04e4cd533d9a4185eadda3141e0783b0f5a0fae (diff) | |
download | otp-fbe1980e5ca85e516648420e0fed0d00b20a0529.tar.gz otp-fbe1980e5ca85e516648420e0fed0d00b20a0529.tar.bz2 otp-fbe1980e5ca85e516648420e0fed0d00b20a0529.zip |
Merge branch 'maint'
Conflicts:
OTP_VERSION
erts/vsn.mk
lib/crypto/c_src/crypto.c
lib/crypto/src/crypto.erl
lib/ssh/src/ssh.erl
Diffstat (limited to 'lib/inets/vsn.mk')
-rw-r--r-- | lib/inets/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index 5637170c15..411bbfc043 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 6.3.6 +INETS_VSN = 6.3.7 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" |