diff options
| author | Micael Karlberg <[email protected]> | 2011-09-23 16:31:27 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-23 16:31:27 +0200 |
| commit | 225be8638c5d1ae82f83f00557c75cdf25ac6bbc (patch) | |
| tree | 95544dbc47d9b279db2345e3f11733a5fd783d75 | |
| parent | 1ead5e977d307ae391fdfd34e28fa5d587db2855 (diff) | |
| parent | 0738421651e4997c1cfc29f2f90b2792bb3a42d6 (diff) | |
| download | otp-225be8638c5d1ae82f83f00557c75cdf25ac6bbc.tar.gz otp-225be8638c5d1ae82f83f00557c75cdf25ac6bbc.tar.bz2 otp-225be8638c5d1ae82f83f00557c75cdf25ac6bbc.zip | |
Merge branch 'dev' into major
| -rw-r--r-- | lib/megaco/doc/src/notes.xml | 42 | ||||
| -rw-r--r-- | lib/megaco/src/app/megaco.appup.src | 11 | ||||
| -rw-r--r-- | lib/megaco/vsn.mk | 2 |
3 files changed, 54 insertions, 1 deletions
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml index 4f678a2a1b..2aba8db71b 100644 --- a/lib/megaco/doc/src/notes.xml +++ b/lib/megaco/doc/src/notes.xml @@ -36,6 +36,48 @@ section is the version number of Megaco.</p> + <section><title>Megaco 3.15.1.1</title> + + <p>Version 3.15.1.1 supports code replacement in runtime from/to + version 3.15.1 and 3.15.</p> + + <section> + <title>Improvements and new features</title> + +<!-- + <p>-</p> +--> + + <list type="bulleted"> + <item> + <p>Correct various XML errors. </p> + <p>Own Id: OTP-9550</p> + </item> + + </list> + + </section> + + <section> + <title>Fixed bugs and malfunctions</title> + + <p>-</p> + + <!-- + <list type="bulleted"> + <item> + <p>Fixing miscellaneous things detected by dialyzer. </p> + <p>Own Id: OTP-9075</p> + </item> + + </list> + --> + + </section> + + </section> <!-- 3.15.1.1 --> + + <section><title>Megaco 3.15.1</title> <p>Version 3.15.1 supports code replacement in runtime from/to diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src index 01b070d79f..7107178d1a 100644 --- a/lib/megaco/src/app/megaco.appup.src +++ b/lib/megaco/src/app/megaco.appup.src @@ -136,10 +136,17 @@ %% | %% v %% 3.15.1 +%% | +%% v +%% 3.15.1.1 %% %% {"%VSN%", [ + {"3.15.1", + [ + ] + }, {"3.15", [ {load_module, megaco_flex_scanner, soft_purge, soft_purge, []}, @@ -153,6 +160,10 @@ } ], [ + {"3.15.1", + [ + ] + }, {"3.15", [ {load_module, megaco_flex_scanner, soft_purge, soft_purge, []}, diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk index 5f71712360..c1476488ca 100644 --- a/lib/megaco/vsn.mk +++ b/lib/megaco/vsn.mk @@ -18,6 +18,6 @@ # %CopyrightEnd% APPLICATION = megaco -MEGACO_VSN = 3.15.1 +MEGACO_VSN = 3.15.1.1 PRE_VSN = APP_VSN = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)" |