diff options
author | Dan Gudmundsson <[email protected]> | 2017-09-20 09:23:09 +0200 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2017-09-20 09:23:09 +0200 |
commit | 99876dd2dd9150ec4b15220c7fd46ed0b8200a19 (patch) | |
tree | e314c222d9528c7e4c21044fa77965904e8ad9e8 /lib/et | |
parent | 8b24be58d37a8912efdcec9cd1e354cfa41e4ef4 (diff) | |
parent | bec2eddd5a3ebf5947d5305bfc8f4e82e84b6681 (diff) | |
download | otp-99876dd2dd9150ec4b15220c7fd46ed0b8200a19.tar.gz otp-99876dd2dd9150ec4b15220c7fd46ed0b8200a19.tar.bz2 otp-99876dd2dd9150ec4b15220c7fd46ed0b8200a19.zip |
Merge branch 'maint'
* maint:
erts, stdlib: Fix xmllint warning
Update runtime deps to depend on new stdlib functionality
Diffstat (limited to 'lib/et')
-rw-r--r-- | lib/et/src/et.app.src | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/et/src/et.app.src b/lib/et/src/et.app.src index 7a5928d6ab..f4e32f734d 100644 --- a/lib/et/src/et.app.src +++ b/lib/et/src/et.app.src @@ -33,6 +33,6 @@ {registered, [et_collector]}, {applications, [stdlib, kernel]}, {env, []}, - {runtime_dependencies, ["wx-1.2","stdlib-2.0","runtime_tools-1.10", - "kernel-3.0","erts-8.0"]} + {runtime_dependencies, ["wx-1.2","stdlib-3.4","runtime_tools-1.10", + "kernel-5.3","erts-9.0"]} ]}. |