diff options
author | Anders Svensson <[email protected]> | 2014-01-28 11:10:26 +0100 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2014-01-28 11:10:26 +0100 |
commit | 9c9fc59620b0e48d357be1e2d1faeb411d2fe31c (patch) | |
tree | 3f8868b3574895416e5a432a3eda83bd60e00b37 /erts/emulator/beam/erl_trace.h | |
parent | 9b0637d83248699eca1673d9b11a542cb2e63720 (diff) | |
parent | 373aa17b2a66420c65a545de477cf54be4deda3e (diff) | |
download | otp-9c9fc59620b0e48d357be1e2d1faeb411d2fe31c.tar.gz otp-9c9fc59620b0e48d357be1e2d1faeb411d2fe31c.tar.bz2 otp-9c9fc59620b0e48d357be1e2d1faeb411d2fe31c.zip |
Merge branch 'anders/diameter/17.0_release/OTP-11605'
* anders/diameter/17.0_release/OTP-11605:
vsn -> 1.6
Remove upgrade-related code
Update appup for 17.0
Avoid type gen_sctp:open_option() until it actually exists
Diffstat (limited to 'erts/emulator/beam/erl_trace.h')
0 files changed, 0 insertions, 0 deletions