summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-26 08:23:50 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-26 08:23:50 +0000
commit35f8beefb68e978e21158bbc0c40556cc09690f1 (patch)
treeb0e08ba2aa523a4eb5c555d75188fd38cd9ddf00 /ChangeLog
parent244260d60b526f47583ed9cfdac995d1b080b393 (diff)
merge revision(s) 49750: [Backport #10876]
* ext/win32/Win32API.rb (initialize): accept both a string and an array for the arguments of the imported function. reported by Aaron Stone [ruby-core:68208] [Bug #10876] [Fixes GH-835] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49761 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 f212c33059..65a0dc4db4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb 26 15:48:41 2015 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/win32/Win32API.rb (initialize): accept both a string and an array
+ for the arguments of the imported function.
+ reported by Aaron Stone [ruby-core:68208] [Bug #10876] [Fixes GH-835]
+
Wed Feb 25 15:36:26 2015 NARUSE, Yui <naruse@ruby-lang.org>
* tool/merger.rb: support 2.1+ versioning scheme.