diff options
author | Björn-Egil Dahlberg <[email protected]> | 2014-04-02 15:38:38 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2014-04-02 15:38:38 +0200 |
commit | eba291a52d4a78c128c5802775fa1bff187e0604 (patch) | |
tree | 4849eb0e7b375ad041c2fb1abd11722c4e4e6a93 /erts/include | |
parent | 5def902915e6cd583ee52a06826fa85c770c0c48 (diff) | |
parent | b8be5e68c8c7015c97a2f62fc3830b86e7a7bc5b (diff) | |
download | otp-eba291a52d4a78c128c5802775fa1bff187e0604.tar.gz otp-eba291a52d4a78c128c5802775fa1bff187e0604.tar.bz2 otp-eba291a52d4a78c128c5802775fa1bff187e0604.zip |
Merge branch 'egil/test-cuddling'
* egil/test-cuddling:
tools: Refactor testcase
emulator: Increase timetrap timeout for binary_SUITE
emulator: Increase timetrap timeout for match_spec_SUITE
Diffstat (limited to 'erts/include')
0 files changed, 0 insertions, 0 deletions