diff options
| author | Rickard Green <[email protected]> | 2017-02-27 18:11:42 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-02-27 18:11:42 +0100 |
| commit | fcaee0793b6d97f64b7a4a0e2d27783ab9d4c20b (patch) | |
| tree | 03a0e821c444feda13801107a9a28dfb8f4b4936 /erts/lib_src | |
| parent | 2117c9e01ed2949b245c8f41c00cac2619a5041a (diff) | |
| parent | fc77f400672d7e9af2c495b96bee1228497acc0e (diff) | |
| download | otp-fcaee0793b6d97f64b7a4a0e2d27783ab9d4c20b.tar.gz otp-fcaee0793b6d97f64b7a4a0e2d27783ab9d4c20b.tar.bz2 otp-fcaee0793b6d97f64b7a4a0e2d27783ab9d4c20b.zip | |
Merge branch 'maint'
* maint:
Ensure prim_eval:'receive' wont clobber def_arg_reg[0]
Conflicts:
erts/preloaded/ebin/prim_eval.beam
Diffstat (limited to 'erts/lib_src')
0 files changed, 0 insertions, 0 deletions