From 8453350cc0e04c3c418ce15f672ff0c417ffab61 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 14 Jan 2009 01:39:19 +0000
Subject: merge revision(s) 18450: 	* stable/ext/socket/socket.c
 (NI_MAXHOST, NI_MAXSERV): fixed invalid 	  preprocessor directives.  a
 patch from Peter Bowen at 	  [ruby-core:18211].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@21498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 01c8ae20ba..9e83c5962e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jan 14 10:32:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* stable/ext/socket/socket.c (NI_MAXHOST, NI_MAXSERV): fixed invalid
+	  preprocessor directives.  a patch from Peter Bowen at
+	  [ruby-core:18211].
+
 Tue Jan 13 04:39:30 2009  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct
-- 
cgit v1.2.3