aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco
diff options
context:
space:
mode:
authorMagnus Lidén <[email protected]>2013-09-17 10:22:16 +0200
committerMagnus Lidén <[email protected]>2013-09-17 10:22:16 +0200
commit5f89a574cb57f94c9d7d45370b5002b1d38147c9 (patch)
treefaa4a449754c8348a8ef06938f8ffe1246ed0b16 /lib/megaco
parent36d4d6fbe37ba9b03a157cdd0e66f3ac28921e0e (diff)
parent20641fe0f2ea745873fc7557448d3a7deb1bd639 (diff)
downloadotp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.tar.gz
otp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.tar.bz2
otp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.zip
Merge tag 'OTP_R16B02'
The R16B02 release Conflicts: lib/sasl/vsn.mk
Diffstat (limited to 'lib/megaco')
-rw-r--r--lib/megaco/doc/src/notes.xml18
-rw-r--r--lib/megaco/vsn.mk2
2 files changed, 18 insertions, 2 deletions
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 50b2661c57..a1039cbda0 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -36,7 +36,23 @@
section is the version number of Megaco.</p>
- <section><title>Megaco 3.17.0.1</title>
+ <section><title>Megaco 3.17.0.2</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Introduced functionality for inspection of system and
+ build configuration.</p>
+ <p>
+ Own Id: OTP-11196</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Megaco 3.17.0.1</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index db956102a6..ea4e9f2eb8 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -18,6 +18,6 @@
# %CopyrightEnd%
APPLICATION = megaco
-MEGACO_VSN = 3.17.0.1
+MEGACO_VSN = 3.17.0.2
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"