summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-01 07:42:01 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-01 07:42:01 +0000
commit509e3e9d31059b06ed40b886e1c03095236413b5 (patch)
tree984761f1af20282a7d80bae755fd375b99a725f5 /ChangeLog
parent83f1241ad5a791df2c2dfbf0be3a316e37c70c67 (diff)
merges r28456 and r28476 from trunk into ruby_1_9_2.
-- * test/win32ole/test_win32ole_method.rb (test_offset_vtbl): check that Ruby is 32bit or 64bit binary in order to get correct offset value. [ruby-dev:41741] -- * test/win32ole/test_win32ole_method.rb (is_ruby64): check ruby binary is mswin64 or mingw64. [ruby-dev:41756] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bec7bcb17a..106c2e2dfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Jun 29 19:39:59 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * test/win32ole/test_win32ole_method.rb (is_ruby64): check
+ ruby binary is mswin64 or mingw64. [ruby-dev:41756]
+
+Mon Jun 28 20:32:33 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * test/win32ole/test_win32ole_method.rb (test_offset_vtbl): check
+ that Ruby is 32bit or 64bit binary in order to get correct offset
+ value. [ruby-dev:41741]
+
Mon Jun 28 21:56:14 2010 Yusuke Endoh <mame@tsg.ne.jp>
* thread.c (rb_fd_resize, rb_fd_copy): avoid NULL dereference upon