diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-11-09 09:40:13 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-11-09 09:40:13 +0100 |
| commit | c420f4a70f373b742a6a10db9352d0f3f0d4f3de (patch) | |
| tree | f97790f429765eba39d108df6ec48aaa7bfeab7f /make/otp.mk.in | |
| parent | 94db3fe12a76c24154a241f9b8afe12b9949f4b9 (diff) | |
| parent | 9604cf9378dc240d9be36d3785bfbd9731437f03 (diff) | |
| download | otp-c420f4a70f373b742a6a10db9352d0f3f0d4f3de.tar.gz otp-c420f4a70f373b742a6a10db9352d0f3f0d4f3de.tar.bz2 otp-c420f4a70f373b742a6a10db9352d0f3f0d4f3de.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
ssl: Do not use gen_fsm:sync_send_all_state_event/3 timeout
Diffstat (limited to 'make/otp.mk.in')
0 files changed, 0 insertions, 0 deletions