diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-05-09 10:29:12 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-05-09 10:29:12 +0200 |
| commit | 67d4141ae1b58e9a63f5eb84f3f01883bd495b64 (patch) | |
| tree | a55c68b019f7bfed1c28aa0cef389c89f02d5687 /lib/erl_interface/src/legacy/erl_marshal.c | |
| parent | 4de491e9c563c49b5d5c88756c5ba00eb0dff66c (diff) | |
| parent | ec7016043e8114a332780b808cb82f5902fe5387 (diff) | |
| download | otp-67d4141ae1b58e9a63f5eb84f3f01883bd495b64.tar.gz otp-67d4141ae1b58e9a63f5eb84f3f01883bd495b64.tar.bz2 otp-67d4141ae1b58e9a63f5eb84f3f01883bd495b64.zip | |
Merge branch 'ingela/ssl/prepare-for-release'
* ingela/ssl/prepare-for-release:
ssl: Prepare for release
Conflicts:
lib/ssl/vsn.mk
Diffstat (limited to 'lib/erl_interface/src/legacy/erl_marshal.c')
0 files changed, 0 insertions, 0 deletions