diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-08-21 16:32:52 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-08-21 16:32:52 +0200 |
| commit | ed5a0b9cdf6a7e87cec1a50c6e9adb29698ce8d9 (patch) | |
| tree | 4b9f103d907d336a45cc4efe1e8f59d95ec29ec1 /lib/stdlib/src/stdlib.app.src | |
| parent | cffe162d9ddce58b2aaf71a102f3b6c6738a2029 (diff) | |
| parent | e2148351cd40a8affacf6fc0589448d15bc603f7 (diff) | |
| download | otp-ed5a0b9cdf6a7e87cec1a50c6e9adb29698ce8d9.tar.gz otp-ed5a0b9cdf6a7e87cec1a50c6e9adb29698ce8d9.tar.bz2 otp-ed5a0b9cdf6a7e87cec1a50c6e9adb29698ce8d9.zip | |
Merge branch 'egil/proc_lib-optimizations/OTP-12060' into maint
* egil/proc_lib-optimizations/OTP-12060:
stdlib: Update dependencies to erts-6.2
erts: Update preloaded erlang.beam
stdlib: Use erlang:fun_info_mfa/1 in proc_lib:init_p/3
erts: Test erlang:fun_info_mfa/1
erts: Introduce erlang:fun_info_mfa/1
Diffstat (limited to 'lib/stdlib/src/stdlib.app.src')
| -rw-r--r-- | lib/stdlib/src/stdlib.app.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src index 3585eec342..aa9899da3b 100644 --- a/lib/stdlib/src/stdlib.app.src +++ b/lib/stdlib/src/stdlib.app.src @@ -103,7 +103,7 @@ dets]}, {applications, [kernel]}, {env, []}, - {runtime_dependencies, ["sasl-2.4","kernel-3.0.2","erts-6.1.2","crypto-3.3", + {runtime_dependencies, ["sasl-2.4","kernel-3.0.2","erts-6.2","crypto-3.3", "compiler-5.0"]} ]}. |