diff options
| author | Rickard Green <[email protected]> | 2017-10-11 15:17:55 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-10-11 15:17:55 +0200 |
| commit | cdb5529d58d35eee831da3c4ae2329c7d6626f51 (patch) | |
| tree | 31ddccf50f1a802011b6832d2c8b5a71abba7e08 /erts/emulator/beam/io.c | |
| parent | 5c917e33b53a397b30ca56a9cdd9922d9df19e7d (diff) | |
| parent | 9cccec48c38544df1d00230aeb340b37890ab8c8 (diff) | |
| download | otp-cdb5529d58d35eee831da3c4ae2329c7d6626f51.tar.gz otp-cdb5529d58d35eee831da3c4ae2329c7d6626f51.tar.bz2 otp-cdb5529d58d35eee831da3c4ae2329c7d6626f51.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
vsn -> 2.1.1
Update appup and code_change for ERIERL-83
Fix missing monitor in diameter_reg
Conflicts:
OTP_VERSION
Diffstat (limited to 'erts/emulator/beam/io.c')
0 files changed, 0 insertions, 0 deletions