aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2011-10-04 11:06:52 +0200
committerErlang/OTP <[email protected]>2011-10-04 11:06:52 +0200
commit7b3131376cab0d87da21359fb703dd44da10c3a2 (patch)
treea0c46e69c79eb5dd6f1aa0f83e80501ccc95e554 /lib/crypto
parentfe70b621ae06e79549b448ddbd6a6b3d866a58f4 (diff)
parent7a087c36e29cc1d12c856054a94772e86b95ee06 (diff)
downloadotp-7b3131376cab0d87da21359fb703dd44da10c3a2.tar.gz
otp-7b3131376cab0d87da21359fb703dd44da10c3a2.tar.bz2
otp-7b3131376cab0d87da21359fb703dd44da10c3a2.zip
Merge branch 'sverker/crypto-openssl.0.9.8-PPC/OTP-9603' into maint-r14
* sverker/crypto-openssl.0.9.8-PPC/OTP-9603: [ssl] Step version for patch 1178 Touch crypto to provoke patch release (again)
Diffstat (limited to 'lib/crypto')
-rw-r--r--lib/crypto/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile
index 2a8fc6acfd..6db5b03912 100644
--- a/lib/crypto/Makefile
+++ b/lib/crypto/Makefile
@@ -36,4 +36,4 @@ SPECIAL_TARGETS =
include $(ERL_TOP)/make/otp_subdir.mk
-# touched by patch 1176
+# touched by patch 1178