diff options
| author | Erlang/OTP <[email protected]> | 2014-07-10 10:45:13 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-07-10 10:45:13 +0200 |
| commit | b376a4b8dd21a943be3226bb696a1622537edf86 (patch) | |
| tree | 04546a16fe10c520c21aecd95caaa890723f75d8 /lib/kernel/src/kernel.app.src | |
| parent | a7176f9186ffd7eb2b26daca2264d425383cf6a7 (diff) | |
| parent | ab5afc3d8cbd0211fef7c9c71edc2708f643f705 (diff) | |
| download | otp-b376a4b8dd21a943be3226bb696a1622537edf86.tar.gz otp-b376a4b8dd21a943be3226bb696a1622537edf86.tar.bz2 otp-b376a4b8dd21a943be3226bb696a1622537edf86.zip | |
Merge branch 'nox/filelib-wildcard-broken-link' into maint-17
* nox/filelib-wildcard-broken-link:
Update stdlib appup file
Update runtime dependencies
Update preloaded
Add tests of filelib and symlinks
Fix handling of broken symlinks in filelib
Conflicts:
erts/preloaded/ebin/erl_prim_loader.beam
Diffstat (limited to 'lib/kernel/src/kernel.app.src')
| -rw-r--r-- | lib/kernel/src/kernel.app.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src index 5658c6b6cf..9f6c0f4624 100644 --- a/lib/kernel/src/kernel.app.src +++ b/lib/kernel/src/kernel.app.src @@ -115,6 +115,6 @@ {applications, []}, {env, [{error_logger, tty}]}, {mod, {kernel, []}}, - {runtime_dependencies, ["erts-6.0", "stdlib-2.0", "sasl-2.4"]} + {runtime_dependencies, ["erts-6.1.2", "stdlib-2.0", "sasl-2.4"]} ] }. |