aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-11-30 19:30:50 +0100
committerSverker Eriksson <[email protected]>2015-11-30 19:30:50 +0100
commit49daa385517010dd03dc5de6b37265eb06d59c5a (patch)
tree76290d5b8f8fa0e2ed8ae7530fd9ab0eedfe744e /lib
parentfc3a963ed6f54f4b5861dc0d71e85a9d1091ff36 (diff)
parent16801311ad52b6d50b4c462da26b3d34f0736e48 (diff)
downloadotp-49daa385517010dd03dc5de6b37265eb06d59c5a.tar.gz
otp-49daa385517010dd03dc5de6b37265eb06d59c5a.tar.bz2
otp-49daa385517010dd03dc5de6b37265eb06d59c5a.zip
Merge branch 'maint'
Conflicts: erts/emulator/beam/erl_gc.c erl_gc.c was a dummy merge (--ours) as the bug does not exist after rewrite.
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions