aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco/src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-03-19 14:54:26 +0100
committerMicael Karlberg <[email protected]>2012-03-19 14:54:26 +0100
commit662e3ffeed74d9121315d86af46430dd71e01709 (patch)
tree544ced81c3d9e0de9823e844ca1cce8d8e28cf30 /lib/megaco/src
parent3087769515ea9bfc75f7d7b8897bc897c7f13931 (diff)
parent78cbfaad628aa2d548432e251ef0943b46a502b2 (diff)
downloadotp-662e3ffeed74d9121315d86af46430dd71e01709.tar.gz
otp-662e3ffeed74d9121315d86af46430dd71e01709.tar.bz2
otp-662e3ffeed74d9121315d86af46430dd71e01709.zip
Merge branch 'bmk/megaco/megaco31601_integration/r15' into maint
Diffstat (limited to 'lib/megaco/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 3c9740818a..7f89fa8bc2 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-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. 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
@@ -142,10 +142,17 @@
%% |
%% v
%% 3.16
+%% |
+%% v
+%% 3.16.0.1
%%
%%
{"%VSN%",
[
+ {"3.16",
+ [
+ ]
+ },
{"3.15.1.1",
[
{restart_application, megaco}
@@ -163,6 +170,10 @@
}
],
[
+ {"3.16",
+ [
+ ]
+ },
{"3.15.1.1",
[
{restart_application, megaco}