diff options
| author | Rickard Green <[email protected]> | 2017-04-24 11:33:00 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-04-24 11:33:00 +0200 |
| commit | 515dc2d603d449ed3621d96028ba403aef05ea7f (patch) | |
| tree | a28ea65c6a4ecabebc3d9f539ae552ac3afe8721 /otp_build | |
| parent | 37158d81c8a49d77b8ba32dbc560b3064127e24d (diff) | |
| parent | e91a9ccc0f95edee164139fa9b6ce2db0cb154b6 (diff) | |
| download | otp-515dc2d603d449ed3621d96028ba403aef05ea7f.tar.gz otp-515dc2d603d449ed3621d96028ba403aef05ea7f.tar.bz2 otp-515dc2d603d449ed3621d96028ba403aef05ea7f.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Do not ignore SIGTERM when VM has been started with +Bi
Conflicts:
OTP_VERSION
erts/emulator/sys/unix/sys.c
erts/vsn.mk
Diffstat (limited to 'otp_build')
0 files changed, 0 insertions, 0 deletions