summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-24 15:11:21 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-24 15:11:21 +0000
commit8b2c390b4a3e057f0ef414643938fd1526afbee6 (patch)
tree3239d054400bfe6824b2fe20a7aa6d9f69a3cd1f /ChangeLog
parent4219cf6878fcbab7b0ed635926d68c21a3944c4f (diff)
merge revision(s) 41590,41591:
* win32/README.win32: grammar typo by @blankenshipz [Fix GH-334] https://github.com/ruby/ruby/pull/334 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41604 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 c2dae19792..0c5333a944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 25 00:10:54 2013 Zachary Scott <zachary@zacharyscott.net>
+
+ * win32/README.win32: grammar typo by @blankenshipz [Fix GH-334]
+ https://github.com/ruby/ruby/pull/334
+
Sun Jun 23 00:09:12 2013 Masaya Tarui <tarui@ruby-lang.org>
* gc.c: Fixup around GC by MALLOC.