aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco/src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-02-29 10:40:48 +0100
committerMicael Karlberg <[email protected]>2012-02-29 10:40:48 +0100
commit414db1d25aac02f246d60d835833c19bbe8d8620 (patch)
treeb5768eee35dd54d7df0d7ab170e770adbc9a0e84 /lib/megaco/src
parentcc3122ab804299810c817f3819323234ff3e23c3 (diff)
parentb873a5b3524ff31d232d4af0da5efcc1a9687ae3 (diff)
downloadotp-414db1d25aac02f246d60d835833c19bbe8d8620.tar.gz
otp-414db1d25aac02f246d60d835833c19bbe8d8620.tar.bz2
otp-414db1d25aac02f246d60d835833c19bbe8d8620.zip
Merge branch 'bmk/megaco/fixing_faulty_test_case' into bmk/megaco/megaco31601_integration/r15
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..2737556d09 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}