aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco/src/app/megaco.appup.src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2014-01-28 12:26:59 +0100
committerMicael Karlberg <[email protected]>2014-01-28 12:26:59 +0100
commiteec1ccfb334e35938f5fe3aeb9f6763d5c496f44 (patch)
treee116daf19a63790c8c22f666cd0c6e1df54d860d /lib/megaco/src/app/megaco.appup.src
parentbb1d3d51651b5f2cd9d8c8b1e541c7e841aaab18 (diff)
parent54853a8be95bff893931fa602695be1598c827b8 (diff)
downloadotp-eec1ccfb334e35938f5fe3aeb9f6763d5c496f44.tar.gz
otp-eec1ccfb334e35938f5fe3aeb9f6763d5c496f44.tar.bz2
otp-eec1ccfb334e35938f5fe3aeb9f6763d5c496f44.zip
Merge branch 'bmk/megaco/prep_for_r17'
Diffstat (limited to 'lib/megaco/src/app/megaco.appup.src')
-rw-r--r--lib/megaco/src/app/megaco.appup.src13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index da171e0c18..db59f55b55 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -2,7 +2,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -165,11 +165,21 @@
%% | | | | |
%% v v v v v
%% 3.17 <- 3.16.1 <- 3.15.2 <- 3.14.2 <- 3.11.4
+%% |
+%% v
+%% 3.17.0.1
+%% |
+%% v
+%% 3.17.0.2
+%% |
+%% v
+%% 3.17.0.3
%%
%%
{"%VSN%",
[
+ {"3.17.0.2", []},
{"3.17.0.1", []},
{"3.17", []},
{"3.16.0.3",
@@ -180,6 +190,7 @@
}
],
[
+ {"3.17.0.2", []},
{"3.17.0.1", []},
{"3.17", []},
{"3.16.0.3",