diff options
| author | Peter Andersson <[email protected]> | 2014-03-25 11:12:39 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2014-03-25 11:12:39 +0100 |
| commit | 26bdb6c47ef7f2222ebe195284506fb6704d104c (patch) | |
| tree | d021048f4fb1bfb4051247e4c8f56d8e5683e7de /lib/Makefile | |
| parent | b12e68f2e49807aee175de4474c2b79b24e24b61 (diff) | |
| parent | b5969a04fe4161311e2006af5351155b18e50eca (diff) | |
| download | otp-26bdb6c47ef7f2222ebe195284506fb6704d104c.tar.gz otp-26bdb6c47ef7f2222ebe195284506fb6704d104c.tar.bz2 otp-26bdb6c47ef7f2222ebe195284506fb6704d104c.zip | |
Merge branch 'peppe/common_test/master_test_timeout'
* peppe/common_test/master_test_timeout:
Shorten default timetrap timeout for ct_master test suite
Diffstat (limited to 'lib/Makefile')
0 files changed, 0 insertions, 0 deletions