diff options
| author | Raimo Niskanen <[email protected]> | 2017-04-28 11:28:59 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2017-04-28 11:28:59 +0200 |
| commit | 3c4e69029ace241f82eb057c219f2942e6c4dd33 (patch) | |
| tree | 6177cd4f95cde1212662a87b76fb47f34c8a9d31 /erts/.gitignore | |
| parent | e069941a410f61cf6ba981ef6ae10e467b9c616c (diff) | |
| parent | eff1ee5ebf1d767d610cd6bc059e5f4dea57d2af (diff) | |
| download | otp-3c4e69029ace241f82eb057c219f2942e6c4dd33.tar.gz otp-3c4e69029ace241f82eb057c219f2942e6c4dd33.tar.bz2 otp-3c4e69029ace241f82eb057c219f2942e6c4dd33.zip | |
Merge branch 'raimo/gen_statem-dev'
OTP-14531 Generic time-outs in gen_statem
Conflicts:
lib/stdlib/test/erl_internal_SUITE.erl
Diffstat (limited to 'erts/.gitignore')
0 files changed, 0 insertions, 0 deletions