diff options
| author | Lukas Larsson <[email protected]> | 2011-10-04 14:05:13 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-10-04 14:05:13 +0200 |
| commit | ea34e624a30da0312cbea8b64d1484a46bb43656 (patch) | |
| tree | f98693e6ccf81af6db8a829626d8fc611677a8bc /erts/doc/src/erl_nif.xml | |
| parent | 2d25f96f904bfa33c4bba4f3026f9fd2117ed8ab (diff) | |
| parent | 3d6153cb2d3a08f9b82a3ea52e69c5442c226559 (diff) | |
| download | otp-ea34e624a30da0312cbea8b64d1484a46bb43656.tar.gz otp-ea34e624a30da0312cbea8b64d1484a46bb43656.tar.bz2 otp-ea34e624a30da0312cbea8b64d1484a46bb43656.zip | |
Merge branch 'dev' into major
* dev:
Prepare release
[ssl] Step version for patch 1178
Touch crypto to provoke patch release (again)
Prepare release
Diffstat (limited to 'erts/doc/src/erl_nif.xml')
0 files changed, 0 insertions, 0 deletions