summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-24 01:39:14 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-24 01:39:14 +0000
commit5841efa380f9fe76b09588fbbc09d17acb0f24ed (patch)
tree8591ff06632ad94105a26c4f248cca8d0aa20ca5 /ChangeLog
parente518f1dd32c4e72f981a85dd0f0f5168e97541ba (diff)
merge revision(s) 36508: [Backport #7015]
* test/win32ole/test_win32ole_method.rb (is_ruby64?): Correct platform used to identify mingw-w64 (x64-mingw32). Patch by Hiroshi Shirosaki. [ruby-core:46651][Bug #6782] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37022 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 1996590b1d..fc9194aca7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep 24 10:38:55 2012 Luis Lavena <luislavena@gmail.com>
+
+ * test/win32ole/test_win32ole_method.rb (is_ruby64?): Correct platform
+ used to identify mingw-w64 (x64-mingw32). Patch by Hiroshi Shirosaki.
+ [ruby-core:46651][Bug #6782]
+
Mon Sep 24 10:37:56 2012 NARUSE, Yui <naruse@ruby-lang.org>
* lib/test/unit/parallel.rb: workaround fix for rubygems.