diff options
| author | Rickard Green <[email protected]> | 2016-08-29 18:50:40 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-29 18:50:40 +0200 |
| commit | 81993991c8438aa31ec0e88f4f67637d43fa70c0 (patch) | |
| tree | b0f7c723ef79c0156bac5f74fcf77dc53aeb656d /.gitattributes | |
| parent | ca85801bf0fffa1bc8b19ca3acb7f69f2361627c (diff) | |
| parent | b815d568e2e43d96698dbb8de6b993d55c1b14a0 (diff) | |
| download | otp-81993991c8438aa31ec0e88f4f67637d43fa70c0.tar.gz otp-81993991c8438aa31ec0e88f4f67637d43fa70c0.tar.bz2 otp-81993991c8438aa31ec0e88f4f67637d43fa70c0.zip | |
Merge branch 'maint'
* maint:
Fix tracing of processes executing dirty
Perform check_process_code while process is executing dirty
Fix purge of code
Reclaim literal area after purge has completed
Separate literal area from code
Conflicts:
erts/emulator/beam/global.h
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions