diff options
author | Micael Karlberg <[email protected]> | 2012-02-29 10:46:07 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2012-02-29 10:46:07 +0100 |
commit | 78cbfaad628aa2d548432e251ef0943b46a502b2 (patch) | |
tree | c366e69c70e3ff0eb8e6e3c2d443d277452b6398 /lib/megaco/doc/src | |
parent | 414db1d25aac02f246d60d835833c19bbe8d8620 (diff) | |
parent | dfd5f918b84e08d648c4e5965a42223f5b6bd0c1 (diff) | |
download | otp-78cbfaad628aa2d548432e251ef0943b46a502b2.tar.gz otp-78cbfaad628aa2d548432e251ef0943b46a502b2.tar.bz2 otp-78cbfaad628aa2d548432e251ef0943b46a502b2.zip |
Merge branch 'bmk/megaco/updating_meas' into bmk/megaco/megaco31601_integration/r15
Conflicts:
lib/megaco/doc/src/notes.xml
lib/megaco/src/app/megaco.appup.src
Diffstat (limited to 'lib/megaco/doc/src')
-rw-r--r-- | lib/megaco/doc/src/notes.xml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml index 39baff28aa..393064fbb5 100644 --- a/lib/megaco/doc/src/notes.xml +++ b/lib/megaco/doc/src/notes.xml @@ -56,6 +56,13 @@ --> </item> + <item> + <p>Removed use of deprecated system flag, + <c>scheduler_bind_type</c>, in the measurement tool + <c>mstone1</c>. </p> + <p>Own Id: OTP-9949</p> + </item> + </list> </section> @@ -95,7 +102,7 @@ </section> - </section> <!-- 3.16 --> + </section> <!-- 3.16.0.1 --> <section><title>Megaco 3.16</title> @@ -112,7 +119,7 @@ <list type="bulleted"> <item> - <p>Minor improvemnts to the emasurement tool mstone1. </p> + <p>Minor improvements to the measurement tool <c>mstone1</c>. </p> <p>Own Id: OTP-9604</p> </item> |