diff options
| author | Péter Dimitrov <[email protected]> | 2019-03-08 14:58:13 +0100 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-03-08 14:58:13 +0100 |
| commit | 6bbf8fd8526b1a2b8510f5cd32b47d3195591036 (patch) | |
| tree | fda3d9b92d78af24f0ed37e6f567b2eb159e759a /erts | |
| parent | f39d734ed638a7e431993c05b143d2cc5bef1690 (diff) | |
| parent | 9377eeb3335a1552bd8a55a774da1608575ef039 (diff) | |
| download | otp-6bbf8fd8526b1a2b8510f5cd32b47d3195591036.tar.gz otp-6bbf8fd8526b1a2b8510f5cd32b47d3195591036.tar.bz2 otp-6bbf8fd8526b1a2b8510f5cd32b47d3195591036.zip | |
Merge branch 'maint'
* maint:
inets: Fix handling of erl_script_timeout
Change-Id: Ie6028000b0bd45307477d837f63c51b2620faaea
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions