diff options
| author | Hans Nilsson <[email protected]> | 2015-07-05 11:19:42 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-07-05 11:19:42 +0200 |
| commit | 5f43059948e4ae242ba4e73a0728cd57b3360f1a (patch) | |
| tree | cacb2dbda58e27a7bfe010dc8dc2cca191d926cd /erts/emulator/beam/beam_emu.c | |
| parent | 26f1810479a837ab338e7a9e3aef027a9e4b098d (diff) | |
| parent | ddc7ce9124a8fb03bb95b5d550812c34f4177946 (diff) | |
| download | otp-5f43059948e4ae242ba4e73a0728cd57b3360f1a.tar.gz otp-5f43059948e4ae242ba4e73a0728cd57b3360f1a.tar.bz2 otp-5f43059948e4ae242ba4e73a0728cd57b3360f1a.zip | |
Merge branch 'maint'
* maint:
ssh: be more generous about disconnect expects
ssh: add disjunction to ssh_trpt_test_lib:match
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
0 files changed, 0 insertions, 0 deletions