diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-11-07 10:57:32 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-11-07 10:57:32 +0100 |
| commit | a8f4d0d3a95f2b94bff496b25797c15cf7154d85 (patch) | |
| tree | 7b24d9ab86aece45ecf61ead9fa75c1e6958591c /lib/ssl/src/Makefile | |
| parent | 2dc2442055672245b612552bd767c8d4e09bc7ae (diff) | |
| parent | 5d19d638d164f39e6d060ab834fc30cb42252876 (diff) | |
| download | otp-a8f4d0d3a95f2b94bff496b25797c15cf7154d85.tar.gz otp-a8f4d0d3a95f2b94bff496b25797c15cf7154d85.tar.bz2 otp-a8f4d0d3a95f2b94bff496b25797c15cf7154d85.zip | |
Merge branch 'egil/erts/cuddle-tests' into maint
* egil/erts/cuddle-tests:
stdlib: Increase timeouts in ets_SUITE
stdlib: Increase timeouts in rand_SUITE
stdlib: Increase timeouts in base64_SUITE
erts: Use cmd on windows for port_SUITE
Diffstat (limited to 'lib/ssl/src/Makefile')
0 files changed, 0 insertions, 0 deletions