summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-08 08:09:11 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-08 08:09:11 +0000
commit2f7d3b465325021f24460fefe3505b374653a018 (patch)
tree3fffd95ebab1a1f79dc5a9285196e0f70d81afcf /ChangeLog
parent11aa04e28fc9b6e6e0d82ccca69359eb9fa276af (diff)
merges r29674 from trunk into ruby_1_9_2.
-- * lib/irb/ruby-lex.rb (RubyLex#identify_string): parse multiple regex options. a patch from Heesob Park in [ruby-core:32988]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30131 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 4c7074d2cc..07203cb231 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 3 07:47:25 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/irb/ruby-lex.rb (RubyLex#identify_string): parse multiple
+ regex options. a patch from Heesob Park in [ruby-core:32988].
+
Sat Oct 30 06:32:52 2010 Tanaka Akira <akr@fsij.org>
* test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the