diff options
| author | Lukas Larsson <[email protected]> | 2019-01-15 16:22:37 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-01-15 16:22:37 +0100 |
| commit | 640851869321694b57f701399c19e093d9bd1dad (patch) | |
| tree | 0a33478fce6b43faeebcc09c084dfde91c3b54f1 /.mailmap | |
| parent | a9b0c987fc6fc6ba11a3db523e4b8afb79c1b69f (diff) | |
| parent | 5f5d0b3dd311ef16b7c6cc61d575cd7e5eccc291 (diff) | |
| download | otp-640851869321694b57f701399c19e093d9bd1dad.tar.gz otp-640851869321694b57f701399c19e093d9bd1dad.tar.bz2 otp-640851869321694b57f701399c19e093d9bd1dad.zip | |
Merge branch 'maint'
Conflicts:
erts/emulator/beam/bif.c
erts/preloaded/ebin/erlang.beam
erts/preloaded/ebin/erts_internal.beam
erts/preloaded/ebin/prim_file.beam
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions