summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-15 16:31:06 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-15 16:31:06 +0000
commit9fb5a1cdbf799fd6ab36eb4782b1a1e0dd3783f4 (patch)
tree5408284c66581ae4d79cc985ba7d7817282f6ef6 /ChangeLog
parent113d3599caa41605e54be08b84a9403adcdebc0c (diff)
merge revision(s) 41266: [Backport #8517]
* ext/socket/extconf.rb: Enable RFC 3542 IPV6 socket options for OS X 10.7+. [ruby-trunk - Bug #8517] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a36d99d76..eb779117b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 16 01:22:35 2013 Eric Hodel <drbrain@segment7.net>
+
+ * ext/socket/extconf.rb: Enable RFC 3542 IPV6 socket options for OS X
+ 10.7+. [ruby-trunk - Bug #8517]
+
Sun Jun 16 01:11:10 2013 Koichi Sasada <ko1@atdot.net>
* compile.c (rb_iseq_compile_node): fix location of a `trace'