aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-02-18 15:52:39 +0100
committerSverker Eriksson <[email protected]>2016-02-18 15:52:39 +0100
commit68c875fe49a712041b7d9dd2c7c6f9ab5fdc19f2 (patch)
tree3890afcdb305fb38ea48823fea90ada23de2bc99 /make
parent8e96e6010cb123b1737d7d3b5dbd0e059f6e1045 (diff)
parent4ce31a8f72726018b1293986b0f627ca2e6bb7fb (diff)
downloadotp-68c875fe49a712041b7d9dd2c7c6f9ab5fdc19f2.tar.gz
otp-68c875fe49a712041b7d9dd2c7c6f9ab5fdc19f2.tar.bz2
otp-68c875fe49a712041b7d9dd2c7c6f9ab5fdc19f2.zip
Merge branch 'sverk/nif-test-cuddle' into maint
* sverk/nif-test-cuddle: erts: Fix wobbling test failure in nif_SUITE
Diffstat (limited to 'make')
0 files changed, 0 insertions, 0 deletions