diff options
author | Zandra Hird <[email protected]> | 2015-02-03 12:55:45 +0100 |
---|---|---|
committer | Zandra Hird <[email protected]> | 2015-02-03 12:55:45 +0100 |
commit | 9a393fb5237b637cc4cfdb79443a1517743eadd8 (patch) | |
tree | 55137e2b85afd9bffdf9355673479878ed6f9d08 /lib/inets/vsn.mk | |
parent | c8bbf52191e3c87eedde061051eebcd02dbb7fd5 (diff) | |
parent | 42d6afe554e11813385dbf175fce58f995c2f9e5 (diff) | |
download | otp-9a393fb5237b637cc4cfdb79443a1517743eadd8.tar.gz otp-9a393fb5237b637cc4cfdb79443a1517743eadd8.tar.bz2 otp-9a393fb5237b637cc4cfdb79443a1517743eadd8.zip |
Merge branch 'maint'
Conflicts:
OTP_VERSION
erts/emulator/sys/unix/sys.c
erts/vsn.mk
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 dbae5e4b3c..7d11916454 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -18,6 +18,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 5.10.4 +INETS_VSN = 5.10.5 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" |