aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco
diff options
context:
space:
mode:
authorMicael Karlberg <bmk@erlang.org>2010-02-03 13:56:44 +0000
committerErlang/OTP <otp@erlang.org>2010-02-03 19:05:16 +0100
commit3e74a8a1af84d923ddcdc8c0f0a2e51298267f8f (patch)
tree3f1443fbfc5bb89d451e04a60d4f0d55738c7c1e /lib/megaco
parent1b78e85c9b6097f0d1940793e5fed4e08c0794f9 (diff)
downloadotp-3e74a8a1af84d923ddcdc8c0f0a2e51298267f8f.tar.gz
otp-3e74a8a1af84d923ddcdc8c0f0a2e51298267f8f.tar.bz2
otp-3e74a8a1af84d923ddcdc8c0f0a2e51298267f8f.zip
OTP-8317, OTP-8323 (rickard) & OTP-8362.
Diffstat (limited to 'lib/megaco')
-rw-r--r--lib/megaco/doc/src/Makefile2
-rw-r--r--lib/megaco/doc/src/notes.xml12
-rw-r--r--lib/megaco/vsn.mk4
3 files changed, 12 insertions, 6 deletions
diff --git a/lib/megaco/doc/src/Makefile b/lib/megaco/doc/src/Makefile
index 537d34441d..2355a1b8b9 100644
--- a/lib/megaco/doc/src/Makefile
+++ b/lib/megaco/doc/src/Makefile
@@ -107,7 +107,7 @@ INDEX_SRC = $(INDEX_FILE).src
INDEX_TARGET = $(DOCDIR)/$(INDEX_FILE)
STANDARD_DIR = ../standard
- $(STANDARD_DIR)/rfc3525.txt \
+STANDARDS = $(STANDARD_DIR)/rfc3525.txt \
$(STANDARD_DIR)/rfc4234.txt \
$(STANDARD_DIR)/rfc4566.txt \
$(STANDARD_DIR)/implementors_guide_v10-13.pdf
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 61f3611029..59b1e59ce9 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -36,9 +36,9 @@
section is the version number of Megaco.</p>
<section>
- <title>Megaco 3.13.0.2</title>
+ <title>Megaco 3.13.1</title>
- <p>Version 3.13.0.2 supports code replacement in runtime from/to
+ <p>Version 3.13.1 supports code replacement in runtime from/to
version 3.13, 3.12 and 3.11.3.</p>
<section>
@@ -50,6 +50,12 @@
<list type="bulleted">
<item>
+ <p>Various changes to configure and makefile(s) to facilitate cross
+ compilation. </p>
+ <p>Own Id: OTP-8323</p>
+ </item>
+
+ <item>
<p>Added a help target in the test Makefile to explain
the most useful make targets, used when testing the
application using the test-server provided with megaco.</p>
@@ -75,7 +81,7 @@
</section>
- </section> <!-- 3.13.0.2 -->
+ </section> <!-- 3.13.1 -->
<section>
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index 9e4ae4d242..4a80c19500 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -19,10 +19,10 @@
APPLICATION = megaco
MEGACO_VSN = 3.13.1
-PRE_VSN =-p01
+PRE_VSN =-p02
APP_VSN = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
-TICKETS = OTP-8317 OTP-8362
+TICKETS = OTP-8317 OTP-8323 OTP-8362
TICKETS_3_13 = OTP-8205 OTP-8239 OTP-8249