summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 10:18:21 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 10:18:21 +0000
commit4701a70b31fdb07f560822d79b1d1f0742a82afb (patch)
tree71f740c418be1780e8fbddad13e7b5e884300292 /ChangeLog
parent4db3a06d6f18d69879340510b25ddd704a00dff0 (diff)
merge revision(s) 37625: [Backport #7333]
* win32/mkexports.rb (each_export): skip garbages generated by VS2012's nmake. reported and patched by Yoshida Masato at [Bug #7333] [ruby-dev:46484] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b9795e85fc..8ba4281edb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Dec 11 19:18:12 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/mkexports.rb (each_export): skip garbages generated by VS2012's
+ nmake.
+ reported and patched by Yoshida Masato at [Bug #7333] [ruby-dev:46484]
+
Tue Dec 11 19:15:51 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_here_document): flush string content between new