diff options
author | Rickard Green <[email protected]> | 2016-09-01 15:33:15 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2016-09-01 15:33:15 +0200 |
commit | 0bbc77b13d97e061221078798ec7019819814597 (patch) | |
tree | 8da3ec4406591ab51386b899c95bf0b3ece614f2 /erts/emulator/test/Makefile | |
parent | 18d398f0908346dbf9f7e2c08f68759a05673d2f (diff) | |
parent | 068185ef518384c0141cc643820f3a2a103ff4c3 (diff) | |
download | otp-0bbc77b13d97e061221078798ec7019819814597.tar.gz otp-0bbc77b13d97e061221078798ec7019819814597.tar.bz2 otp-0bbc77b13d97e061221078798ec7019819814597.zip |
Merge branch 'maint'
* maint:
Fix reclaim of literal areas
Conflicts:
erts/emulator/beam/global.h
Diffstat (limited to 'erts/emulator/test/Makefile')
0 files changed, 0 insertions, 0 deletions