diff options
author | Björn-Egil Dahlberg <[email protected]> | 2017-01-17 16:05:43 +0100 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2017-01-17 16:05:43 +0100 |
commit | 6927f85ed386ea3c0f43bd042ea4c917103d76a2 (patch) | |
tree | 32e0974dcec0c7ac1589da40ecf800d03451afa5 /erts/Makefile.in | |
parent | 9b6643e4c573e4a5536a48f8115f12d0b99f9d41 (diff) | |
parent | e1b844db68a770d7d519ff62de827ffba90213b1 (diff) | |
download | otp-6927f85ed386ea3c0f43bd042ea4c917103d76a2.tar.gz otp-6927f85ed386ea3c0f43bd042ea4c917103d76a2.tar.bz2 otp-6927f85ed386ea3c0f43bd042ea4c917103d76a2.zip |
Merge branch 'egil/cuddle-tests' into maint
* egil/cuddle-tests:
stdlib: Increase timetrap for rand_SUITE
common_test: Increase timetrap for cth_hooks_SUITE
compiler: Increase timetrap timeouts for lc_SUITE
Diffstat (limited to 'erts/Makefile.in')
0 files changed, 0 insertions, 0 deletions