summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-08 15:33:06 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-08 15:33:06 +0000
commitd8d4f18af86a10763f25e54155f0f0953453259a (patch)
treedfb2d0c50efe21a069bba4e3ea2fae9eaf7f4d01 /ChangeLog
parent556a67e569030495019b724a5ecc89d873f8886a (diff)
merges r24372 from trunk into ruby_1_9_1.
-- * sample/svr.rb: obsolete TCPserver renamed. [ruby-core:24712] * sample/tsvr.rb: ditto. * sample/dualstack-httpd.rb: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e20dcee39..9ee9fd67f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Aug 3 18:25:08 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * sample/svr.rb: obsolete TCPserver renamed. [ruby-core:24712]
+
+ * sample/tsvr.rb: ditto.
+
+ * sample/dualstack-httpd.rb: ditto.
+
Mon Aug 3 18:12:54 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* thread.c (recursive_push): untrust internal hash to prevent