aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-12-03 14:58:38 +0100
committerLukas Larsson <[email protected]>2010-12-03 14:58:38 +0100
commit52b0fbbc4daa4e22fcad6fe39dd8f8cec8bb8d1b (patch)
tree2ac7cdb72189794e1d2600190af148db0b8f4779 /.mailmap
parent74ec1253e1a89f0bb266831f73716a24c0798dc1 (diff)
parent5bc0e21b553ac256c31dfce920c7e5b9802754ad (diff)
downloadotp-52b0fbbc4daa4e22fcad6fe39dd8f8cec8bb8d1b.tar.gz
otp-52b0fbbc4daa4e22fcad6fe39dd8f8cec8bb8d1b.tar.bz2
otp-52b0fbbc4daa4e22fcad6fe39dd8f8cec8bb8d1b.zip
Merge branch 'lukas/common_test/extend_timeout_for_win' into dev
* lukas/common_test/extend_timeout_for_win: Update the support init_per_suite to extend the timeout for starting a slave node on windows.
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions