diff options
author | Rickard Green <[email protected]> | 2016-09-14 10:10:04 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2016-09-14 10:10:04 +0200 |
commit | 596b238d2ab630d680484bd61eace06712e5908f (patch) | |
tree | 7308223f0c0b1e8e20d40e736f0377387ca946b0 /.mailmap | |
parent | 83bf7bd198921895b0ca29f7cd1cdb935a68f6e9 (diff) | |
parent | bc9d81f0e4b62927cf97e3e5b31fdb88ab3bceb9 (diff) | |
download | otp-596b238d2ab630d680484bd61eace06712e5908f.tar.gz otp-596b238d2ab630d680484bd61eace06712e5908f.tar.bz2 otp-596b238d2ab630d680484bd61eace06712e5908f.zip |
Merge branch 'rickard/test-cuddle' into maint
* rickard/test-cuddle:
Ensure long enough sleep in driver_SUITE:timer_delay driver
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions