aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-10-12 16:30:38 +0200
committerRickard Green <[email protected]>2017-10-12 16:30:38 +0200
commit55693961fbb6371d2c3ec0a426f30b8acace6ed1 (patch)
tree7debd0d509349e26508c211763f1865652c623ef /erts/preloaded/src
parent4900f9886cc80ecf34f9590829878da937e75422 (diff)
parentf28539265d753bbaa473cb488e951bfe47304a01 (diff)
downloadotp-55693961fbb6371d2c3ec0a426f30b8acace6ed1.tar.gz
otp-55693961fbb6371d2c3ec0a426f30b8acace6ed1.tar.bz2
otp-55693961fbb6371d2c3ec0a426f30b8acace6ed1.zip
Merge branch 'maint'
* maint: Revert "Merge branch 'rickard/null-char-filenames/ERL-370/OTP-14543' into maint"
Diffstat (limited to 'erts/preloaded/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 beb29a7c89..7ab06164b4 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.4.3", "kernel-5.4.1", "sasl-3.0.1"]}
+ {runtime_dependencies, ["stdlib-3.0", "kernel-5.0", "sasl-3.0.1"]}
]}.
%% vim: ft=erlang