diff options
| author | Björn Gustavsson <[email protected]> | 2014-06-17 10:40:17 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-06-17 10:40:17 +0200 |
| commit | 43285542322eccebb8f337610b6a48ddc9c87ca3 (patch) | |
| tree | 162450a40d79171d012902fea9b2f4a777bfd29e /lib/kernel/src/gen_sctp.erl | |
| parent | ae0628f46f634e486ee2b19a1f318a7fbb9130fe (diff) | |
| parent | ab8c6675511cb1968c57fab3dd8e47cc48037c06 (diff) | |
| download | otp-43285542322eccebb8f337610b6a48ddc9c87ca3.tar.gz otp-43285542322eccebb8f337610b6a48ddc9c87ca3.tar.bz2 otp-43285542322eccebb8f337610b6a48ddc9c87ca3.zip | |
Merge branch 'bjorn/erts/fix-prim_eval' into maint
* bjorn/erts/fix-prim_eval:
add_abstract_code: Remove 'from_asm' option
Diffstat (limited to 'lib/kernel/src/gen_sctp.erl')
0 files changed, 0 insertions, 0 deletions