summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-29 10:44:27 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-29 10:44:27 +0000
commit42f3ae0286dde31fa217a95f11d3264ef4fba60f (patch)
tree21c069d6b1bb2b128b560cd33f977919805ca3cd /ChangeLog
parent1a291e4544ff6a9e1928588c9c2daf50b7ba6bf5 (diff)
garbage
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d5c40f4b73..c70cdbea77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,7 +79,6 @@ Mon Jul 28 18:53:03 2003 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/openssl/extconf.rb: check again after pkg-config for MinGW on
Cygwin.
->>>>>>> 1.1963
Mon Jul 28 15:32:04 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/stringio/stringio.c (strio_gets): only "gets" should set $_.