aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-11-16 15:48:08 +0100
committerSverker Eriksson <[email protected]>2015-11-16 15:48:08 +0100
commit732457ffdd48d7d76a112d46ecb7b75c38c1065b (patch)
treecad3250ec445fca345420e51f4d70d0328979762 /erts/preloaded
parentc16c45a587a199987dae799ea02fb9c32216854f (diff)
parent16293b64dee1357b36926fc62ab59bca5cfdef0b (diff)
downloadotp-732457ffdd48d7d76a112d46ecb7b75c38c1065b.tar.gz
otp-732457ffdd48d7d76a112d46ecb7b75c38c1065b.tar.bz2
otp-732457ffdd48d7d76a112d46ecb7b75c38c1065b.zip
Merge branch 'sverk/nif_SUITE-win64-long-bug' into maint
* sverk/nif_SUITE-win64-long-bug: erts: Fix nif_SUITE for win64
Diffstat (limited to 'erts/preloaded')
0 files changed, 0 insertions, 0 deletions