aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2015-05-27 10:44:06 +0200
committerHans Bolinder <[email protected]>2015-05-27 10:44:06 +0200
commita8a30c4852fe800ba91efa4b78e4980f8eebc904 (patch)
tree3dd7fda48a9a5682302d878763d5bdc40ea0b9e0 /lib/inets
parent50cdb87765cd46e0a809d97f62df28baf8a2c16a (diff)
parent8d4b54db1b4756ea52ebc72df76ae5f13e276d9a (diff)
downloadotp-a8a30c4852fe800ba91efa4b78e4980f8eebc904.tar.gz
otp-a8a30c4852fe800ba91efa4b78e4980f8eebc904.tar.bz2
otp-a8a30c4852fe800ba91efa4b78e4980f8eebc904.zip
Merge branch 'hb/update_versions'
* hb/update_versions: Update application versions
Diffstat (limited to 'lib/inets')
-rw-r--r--lib/inets/vsn.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index ecb84e447c..f52347e39e 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -2,7 +2,7 @@
# %CopyrightBegin%
#
-# Copyright Ericsson AB 2001-2014. All Rights Reserved.
+# Copyright Ericsson AB 2001-2015. 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
@@ -18,6 +18,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 5.10.8
+INETS_VSN = 6.0
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"