aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-01-23 18:08:56 +0100
committerSverker Eriksson <[email protected]>2017-01-23 18:08:56 +0100
commit5a97f05aa92b4a68083390c9eb5e33193213086f (patch)
tree4fdcbdb38d8495ec310a59e5a3cc27212ea94e18 /scripts
parent941dc6198b0ca34eff7a9b30f986e964cbcccefb (diff)
parent82ba60f0ead61f344e2a7ebd383f62e99cb0375d (diff)
downloadotp-5a97f05aa92b4a68083390c9eb5e33193213086f.tar.gz
otp-5a97f05aa92b4a68083390c9eb5e33193213086f.tar.bz2
otp-5a97f05aa92b4a68083390c9eb5e33193213086f.zip
Merge branch 'sverker/cuddle-port_trace_SUITE' into maint
* sverker/cuddle-port_trace_SUITE: erts: Fix port_trace_SUITE to join threads
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions