aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/Makefile
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-04-25 09:17:44 +0200
committerLukas Larsson <[email protected]>2018-04-25 09:17:44 +0200
commit05d89214dd7614b7f7177a7e4409d39aea6d4491 (patch)
tree41d8ceff866575473fddd8b8528a85e40db9dd45 /erts/emulator/Makefile
parent77fcc67696c514b7fedd37720fdafe7533684e08 (diff)
parent468c3b5722034e80bbe6e47b6877b4221766bec1 (diff)
downloadotp-05d89214dd7614b7f7177a7e4409d39aea6d4491.tar.gz
otp-05d89214dd7614b7f7177a7e4409d39aea6d4491.tar.bz2
otp-05d89214dd7614b7f7177a7e4409d39aea6d4491.zip
Merge branch 'lukas/erts/dump_SUITE_fix'
* lukas/erts/dump_SUITE_fix: erts: Increase file read timeout for signal_abort test
Diffstat (limited to 'erts/emulator/Makefile')
0 files changed, 0 insertions, 0 deletions