diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-05-09 10:54:26 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-05-09 10:54:26 +0200 |
| commit | 7bc46f866e0e90fa6282a2893337be0c4d8d8989 (patch) | |
| tree | 6be1cd8e60f3a7c9f302ac14bc89ed61eb856bcf /lib/et/src/et.app.src | |
| parent | 36b79cc56bd681e324a24237a89d560bb7cb0f88 (diff) | |
| parent | 5449073a9a78b0b0a387852b6c596a9ab9dea1bd (diff) | |
| download | otp-7bc46f866e0e90fa6282a2893337be0c4d8d8989.tar.gz otp-7bc46f866e0e90fa6282a2893337be0c4d8d8989.tar.bz2 otp-7bc46f866e0e90fa6282a2893337be0c4d8d8989.zip | |
Merge branch 'egil/et/fix-trace-tags/OTP-13545'
* egil/et/fix-trace-tags/OTP-13545:
et: Update runtime dependencies
et: Update gc trace tags in selector
et: Remove unnecessary boilerplate in tests
Diffstat (limited to 'lib/et/src/et.app.src')
| -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 77b9488c7e..7a5928d6ab 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.8.14", - "kernel-3.0","erts-6.0"]} + {runtime_dependencies, ["wx-1.2","stdlib-2.0","runtime_tools-1.10", + "kernel-3.0","erts-8.0"]} ]}. |