summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 10:17:13 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 10:17:13 +0000
commit4db3a06d6f18d69879340510b25ddd704a00dff0 (patch)
treee21b3ed74b6bb363af10434837ae29bdf79348e0 /ChangeLog
parent4a2867abe169c563e463f749923a7dbed640c409 (diff)
merge revision(s) 38235: [Backport #7255]
* parse.y (parser_here_document): flush string content between new line and :string_embexpr. [ruby-core:48703] [Bug #7255] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38319 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 623b00c867..b9795e85fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 11 19:15:51 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (parser_here_document): flush string content between new
+ line and :string_embexpr. [ruby-core:48703] [Bug #7255]
+
Tue Dec 11 19:01:45 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/erb.rb (ERB#run, ERB#result): eval under isolated bindings for