diff options
author | Ingela Anderton Andin <[email protected]> | 2016-08-30 17:51:29 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2016-08-30 17:51:29 +0200 |
commit | 182ffd5e09a381e54f2ddb5687f74cca059b0f28 (patch) | |
tree | 3d981a87e20fad0de47b691d108223b53b0ed13f /lib/parsetools/vsn.mk | |
parent | e23ca15e90b45b278bff5cf2597dc9cb0b6fe43f (diff) | |
parent | fe61b290007066da283be78c7540bb4d81711deb (diff) | |
download | otp-182ffd5e09a381e54f2ddb5687f74cca059b0f28.tar.gz otp-182ffd5e09a381e54f2ddb5687f74cca059b0f28.tar.bz2 otp-182ffd5e09a381e54f2ddb5687f74cca059b0f28.zip |
Merge branch 'ingela/ssl/tests-timouts' into maint
* ingela/ssl/tests-timouts:
ssl: Timeout tuning
Diffstat (limited to 'lib/parsetools/vsn.mk')
0 files changed, 0 insertions, 0 deletions