diff options
| author | Erlang/OTP <[email protected]> | 2010-09-13 17:57:05 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-09-13 17:57:05 +0200 |
| commit | 807a9ec710cdd78199ee1dc77ca151f428810e0b (patch) | |
| tree | bbd3ec509fc20a416b69e075d4a38a80be11cb37 | |
| parent | a1a4c79887cf827c018cf767e320fd249cd24231 (diff) | |
| parent | 2c9ce108c495d4b12bd7d6d7a46af16b839ffa3d (diff) | |
| download | otp-807a9ec710cdd78199ee1dc77ca151f428810e0b.tar.gz otp-807a9ec710cdd78199ee1dc77ca151f428810e0b.tar.bz2 otp-807a9ec710cdd78199ee1dc77ca151f428810e0b.zip | |
Merge branch 'bmk/inets/prepare_for_r14b' of ../bmk_otp into dev
* 'bmk/inets/prepare_for_r14b' of ../bmk_otp:
Prepare release for inets-5.5 (R14B).
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 66 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 3 |
2 files changed, 5 insertions, 64 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 64fe664006..84d8c9278d 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,74 +18,14 @@ {"%VSN%", [ - {"5.3.3", + {"5.4", [ {restart_application, inets} ] - }, - {"5.3.2", - [ - {restart_application, inets} - ] - }, - {"5.3.1", - [ - {restart_application, inets} - ] - }, - {"5.3", - [ - {restart_application, inets} - ] - }, - {"5.2", - [ - {restart_application, inets} - ] - }, - {"5.1.3", - [ - {restart_application, inets} - ] - }, - {"5.1.2", - [ - {restart_application, inets} - ] - } + } ], [ - {"5.3.3", - [ - {restart_application, inets} - ] - }, - {"5.3.2", - [ - {restart_application, inets} - ] - }, - {"5.3.1", - [ - {restart_application, inets} - ] - }, - {"5.3", - [ - {restart_application, inets} - ] - }, - {"5.2", - [ - {restart_application, inets} - ] - }, - {"5.1.3", - [ - {restart_application, inets} - ] - }, - {"5.1.2", + {"5.4", [ {restart_application, inets} ] diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index b53d47d99c..5eff9e4e3f 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -1,4 +1,5 @@ APPLICATION = inets -INETS_VSN = 5.4 +INETS_VSN = 5.5 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" + |