summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-14 04:19:06 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-14 04:19:06 +0000
commit3d55c375a1fc328999eba508e1c37669f599ffe0 (patch)
treecae1916bfaf33afdb5eca307daff8c6693b68227 /ChangeLog
parent26e1ebb15e9d8c0bd82b4d0d56f54aafc6a8600a (diff)
merge revision(s) 34796:
* parse.y (parser_tokadd_string): insert a backslash only if quoted by single quotes. [ruby-dev:45281] [Bug #6069] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35643 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 86c9de5f03..bf9d2b7fc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 14 13:18:56 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (parser_tokadd_string): insert a backslash only if
+ quoted by single quotes. [ruby-dev:45281] [Bug #6069]
+
Mon May 14 13:17:57 2012 Luis Lavena <luislavena@gmail.com>
* test/ruby/test_io.rb (class TestIO): Disable GC during IO tests to