diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-08-23 16:28:41 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-08-23 16:28:41 +0200 |
| commit | 614816910235c0941b2f36da520610e777b35fc3 (patch) | |
| tree | 80f208bac66743778c2a48c3a2e03e1d7be8d553 /erts | |
| parent | 5f9c7987b3f4b34c4028783dc0f3f1c6c903d6ab (diff) | |
| parent | c72b20183a780c7199d3959f09eb88c1a930a064 (diff) | |
| download | otp-614816910235c0941b2f36da520610e777b35fc3.tar.gz otp-614816910235c0941b2f36da520610e777b35fc3.tar.bz2 otp-614816910235c0941b2f36da520610e777b35fc3.zip | |
Merge branch 'maint-r15' into maint-r16
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/http_lib/http_transport.erl
lib/inets/src/inets_app/inets.appup.src
lib/inets/vsn.mk
lib/ssl/doc/src/notes.xml
lib/ssl/src/ssl.appup.src
lib/ssl/src/ssl.erl
lib/ssl/src/ssl_internal.hrl
lib/ssl/src/tls_connection.erl
lib/ssl/vsn.mk
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions