aboutsummaryrefslogtreecommitdiffstats
path: root/lib/observer/test/Makefile
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-12-16 14:34:26 +0100
committerErlang/OTP <[email protected]>2010-12-16 14:34:26 +0100
commit15daa43c1d5b953b28c998b30d39cec9ab2514b4 (patch)
tree4652579a41503cbc86ec0719d227015367a0a540 /lib/observer/test/Makefile
parent73205a499c16781ecd064ec2446d502b3c0d01b6 (diff)
parente10e306098b6f331ec683147e34a4a745900c144 (diff)
downloadotp-15daa43c1d5b953b28c998b30d39cec9ab2514b4.tar.gz
otp-15daa43c1d5b953b28c998b30d39cec9ab2514b4.tar.bz2
otp-15daa43c1d5b953b28c998b30d39cec9ab2514b4.zip
Merge branch 'nick/orber/old_ssl_option/OTP-8994' into maint-r14
* 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 'lib/observer/test/Makefile')
0 files changed, 0 insertions, 0 deletions