diff options
| author | Hans Bolinder <[email protected]> | 2011-09-02 14:52:34 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2011-09-02 14:52:34 +0200 |
| commit | e3ea0057e30ee844076df98a8a7350ebb78754d8 (patch) | |
| tree | be55ed8a5b9b006248069c9e4d6bf8328f411d6c /lib/ssl/src/ssl.erl | |
| parent | ce148d0dc69797091a998ed73cf0a3dd6df83ec9 (diff) | |
| parent | 6a113a60dba9fd6c4d736b9e56c52f3494a15027 (diff) | |
| download | otp-e3ea0057e30ee844076df98a8a7350ebb78754d8.tar.gz otp-e3ea0057e30ee844076df98a8a7350ebb78754d8.tar.bz2 otp-e3ea0057e30ee844076df98a8a7350ebb78754d8.zip | |
Merge branch 'dev' into major
* dev:
Update documentation and specifications of some of the zlib functions
Conflicts:
erts/preloaded/ebin/zlib.beam
Diffstat (limited to 'lib/ssl/src/ssl.erl')
0 files changed, 0 insertions, 0 deletions