diff options
author | Hans Bolinder <[email protected]> | 2015-05-25 09:57:28 +0200 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2015-05-25 09:57:28 +0200 |
commit | c09328683871e426f3b6ac0976950d31ff5104df (patch) | |
tree | 7db521e8f031a30d4d8d025d0353d5daa377f5d4 /lib/megaco | |
parent | 46a50404b4d0eed5594cf468a4a61cfff9aec84f (diff) | |
parent | 2c2260044637b8acd706cf3a784568e27340e61e (diff) | |
download | otp-c09328683871e426f3b6ac0976950d31ff5104df.tar.gz otp-c09328683871e426f3b6ac0976950d31ff5104df.tar.bz2 otp-c09328683871e426f3b6ac0976950d31ff5104df.zip |
Merge branch 'hb/runtime_deps/OTP-12762'
* hb/runtime_deps/OTP-12762:
Update runtime_dependencies in application resource files
Diffstat (limited to 'lib/megaco')
-rw-r--r-- | lib/megaco/src/app/megaco.app.src | 4 | ||||
-rw-r--r-- | lib/megaco/vsn.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/megaco/src/app/megaco.app.src b/lib/megaco/src/app/megaco.app.src index 6ab85a1bbc..3720b1109e 100644 --- a/lib/megaco/src/app/megaco.app.src +++ b/lib/megaco/src/app/megaco.app.src @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2013. All Rights Reserved. +%% Copyright Ericsson AB 1999-2015. 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 @@ -113,7 +113,7 @@ {applications, [stdlib, kernel]}, {env, []}, {mod, {megaco_sup, []}}, - {runtime_dependencies, ["stdlib-2.0","runtime_tools-1.8.14","kernel-3.0", + {runtime_dependencies, ["stdlib-2.5","runtime_tools-1.8.14","kernel-3.0", "et-1.5","erts-6.0","debugger-4.0", "asn1-3.0"]} ]}. diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk index 8687d622e9..ede36e3fe6 100644 --- a/lib/megaco/vsn.mk +++ b/lib/megaco/vsn.mk @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2014. All Rights Reserved. +# Copyright Ericsson AB 1997-2015. 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 @@ -18,6 +18,6 @@ # %CopyrightEnd% APPLICATION = megaco -MEGACO_VSN = 3.17.3 +MEGACO_VSN = 3.18 PRE_VSN = APP_VSN = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)" |