aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco/src/app/megaco.app.src
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2015-05-29 10:51:53 +0200
committerBjörn Gustavsson <[email protected]>2015-05-29 10:51:53 +0200
commiteca01e7621918cb81535d0243d28adcc8dfbba34 (patch)
treeaf7d31e2914601f8319f12a311af29a330a82758 /lib/megaco/src/app/megaco.app.src
parentbc3a55ca6581fae7bc0f531979de0e46fd44aff5 (diff)
parent3650d333cb06547b8b05ca90d08922a49f919cc6 (diff)
downloadotp-eca01e7621918cb81535d0243d28adcc8dfbba34.tar.gz
otp-eca01e7621918cb81535d0243d28adcc8dfbba34.tar.bz2
otp-eca01e7621918cb81535d0243d28adcc8dfbba34.zip
Merge branch 'bjorn/megaco/eliminate-now'
* bjorn/megaco/eliminate-now: megaco: Eliminate use of erlang:now/0
Diffstat (limited to 'lib/megaco/src/app/megaco.app.src')
-rw-r--r--lib/megaco/src/app/megaco.app.src2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/megaco/src/app/megaco.app.src b/lib/megaco/src/app/megaco.app.src
index 3720b1109e..573b1857f6 100644
--- a/lib/megaco/src/app/megaco.app.src
+++ b/lib/megaco/src/app/megaco.app.src
@@ -114,7 +114,7 @@
{env, []},
{mod, {megaco_sup, []}},
{runtime_dependencies, ["stdlib-2.5","runtime_tools-1.8.14","kernel-3.0",
- "et-1.5","erts-6.0","debugger-4.0",
+ "et-1.5","erts-7.0","debugger-4.0",
"asn1-3.0"]}
]}.