diff options
| author | Erlang/OTP <[email protected]> | 2010-12-14 17:21:22 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-12-14 17:21:22 +0100 |
| commit | 06ff115c291c4bb07a728bbeb72f67822e9d4b80 (patch) | |
| tree | cea5739ba4e858904c17a2a4b26fa23495fc1052 /erts/vsn.mk | |
| parent | 34f7f62caf25ef159b63ca4f080e212b8726675f (diff) | |
| parent | e10e306098b6f331ec683147e34a4a745900c144 (diff) | |
| download | otp-06ff115c291c4bb07a728bbeb72f67822e9d4b80.tar.gz otp-06ff115c291c4bb07a728bbeb72f67822e9d4b80.tar.bz2 otp-06ff115c291c4bb07a728bbeb72f67822e9d4b80.zip | |
Merge branch 'nick/orber/old_ssl_option/OTP-8994' into maint-r13
* nick/orber/old_ssl_option/OTP-8994:
The SSL option {ssl_imp, old} was not used if ssl_generation was set to 2. Only R14B was affected by this.
Conflicts:
lib/orber/doc/src/notes.xml
lib/orber/vsn.mk
Diffstat (limited to 'erts/vsn.mk')
0 files changed, 0 insertions, 0 deletions