aboutsummaryrefslogtreecommitdiffstats
path: root/erts/man
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-09-14 09:59:08 +0200
committerRickard Green <[email protected]>2016-09-14 09:59:08 +0200
commit4ad2eb90dbaab253cdac83030655b9bf6e4bc53d (patch)
treedb0dbb0d12d2c39e867cc343ce35a84c99bb51af /erts/man
parent590561c0d40d9874d11d8d714beb0c390d93d42d (diff)
parent83bf7bd198921895b0ca29f7cd1cdb935a68f6e9 (diff)
downloadotp-4ad2eb90dbaab253cdac83030655b9bf6e4bc53d.tar.gz
otp-4ad2eb90dbaab253cdac83030655b9bf6e4bc53d.tar.bz2
otp-4ad2eb90dbaab253cdac83030655b9bf6e4bc53d.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release Fix crash due to heap fragments left after GC Conflicts: OTP_VERSION erts/emulator/beam/erl_gc.c
Diffstat (limited to 'erts/man')
0 files changed, 0 insertions, 0 deletions