aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_alloc.c
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-11-04 13:42:59 +0100
committerFredrik Gustafsson <[email protected]>2013-11-04 13:42:59 +0100
commit90b1b181d4fb147dfb7403e910a057289bdd21b2 (patch)
treea9d0d809d6d1d2041cf20e07f673d88680737111 /erts/emulator/beam/erl_alloc.c
parentc911744728926ee44a8dafd1ad44168dcc97201e (diff)
parent1fd424859cfaebd371a08ab5977623dd20d28067 (diff)
downloadotp-90b1b181d4fb147dfb7403e910a057289bdd21b2.tar.gz
otp-90b1b181d4fb147dfb7403e910a057289bdd21b2.tar.bz2
otp-90b1b181d4fb147dfb7403e910a057289bdd21b2.zip
Merge branch 'klyr/fix-ssl-npn-doc-2/OTP-11457' into maint
* klyr/fix-ssl-npn-doc-2/OTP-11457: Fix client_preferred_next_protocols documentation
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
0 files changed, 0 insertions, 0 deletions