aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src/erts.app.src
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-10-02 10:41:15 +0200
committerRickard Green <[email protected]>2017-10-02 10:41:15 +0200
commit0717a2194e863f3a78595184ccc5637697f03353 (patch)
treeecc57cc352c8d2171c0f7a329799bfd92a325b73 /erts/preloaded/src/erts.app.src
parent71a40658a0cef8b3e25df3a8e48a72d0563a89bf (diff)
parenteae496a72e270fd7af411714738e99a7fadfd19b (diff)
downloadotp-0717a2194e863f3a78595184ccc5637697f03353.tar.gz
otp-0717a2194e863f3a78595184ccc5637697f03353.tar.bz2
otp-0717a2194e863f3a78595184ccc5637697f03353.zip
Merge branch 'rickard/null-char-filenames/ERL-370/OTP-14543' into maint
* rickard/null-char-filenames/ERL-370/OTP-14543: Don't allow null in filenames
Diffstat (limited to 'erts/preloaded/src/erts.app.src')
-rw-r--r--erts/preloaded/src/erts.app.src2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/erts.app.src b/erts/preloaded/src/erts.app.src
index 7ab06164b4..beb29a7c89 100644
--- a/erts/preloaded/src/erts.app.src
+++ b/erts/preloaded/src/erts.app.src
@@ -37,7 +37,7 @@
{registered, []},
{applications, []},
{env, []},
- {runtime_dependencies, ["stdlib-3.0", "kernel-5.0", "sasl-3.0.1"]}
+ {runtime_dependencies, ["stdlib-3.4.3", "kernel-5.4.1", "sasl-3.0.1"]}
]}.
%% vim: ft=erlang