diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-02 12:36:22 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-02 12:36:22 +0100 |
| commit | 21b920e38078412f3d47442b27b40b3601a1c7d7 (patch) | |
| tree | 482ff1bca79bbd2bade20fa89414c18b343c3dd7 /erts | |
| parent | 230798a4231397ddae2f46594a4123e666c41ef6 (diff) | |
| parent | 3f09864488e77655c9bcb5c70a9b4aead46b3a36 (diff) | |
| download | otp-21b920e38078412f3d47442b27b40b3601a1c7d7.tar.gz otp-21b920e38078412f3d47442b27b40b3601a1c7d7.tar.bz2 otp-21b920e38078412f3d47442b27b40b3601a1c7d7.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions