aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2013-09-13 13:07:43 +0200
committerBjörn-Egil Dahlberg <[email protected]>2013-09-13 13:07:43 +0200
commit40d72d3c54e7a92e0a86ded57907281f7e16e7f4 (patch)
tree44192e269580f330740213176bf8aeccb638d6b9
parent2c19557ef4a09278c2bc448db1524a39e686c9e7 (diff)
parent5d89ddd1254464947d7a90aff25990de0c02896e (diff)
downloadotp-40d72d3c54e7a92e0a86ded57907281f7e16e7f4.tar.gz
otp-40d72d3c54e7a92e0a86ded57907281f7e16e7f4.tar.bz2
otp-40d72d3c54e7a92e0a86ded57907281f7e16e7f4.zip
Merge branch 'maint'
-rw-r--r--lib/megaco/src/app/megaco.appup.src4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index b3659366a4..da171e0c18 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -170,6 +170,8 @@
{"%VSN%",
[
+ {"3.17.0.1", []},
+ {"3.17", []},
{"3.16.0.3",
[
{update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_17},
@@ -178,6 +180,8 @@
}
],
[
+ {"3.17.0.1", []},
+ {"3.17", []},
{"3.16.0.3",
[
{update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_17},