summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-17 15:43:58 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-17 15:43:58 +0000
commitc03f37d6096761fb9bb0a9efc2643213f74ea675 (patch)
tree711cbbd66679ec134bef72dc1eb98ec87c623c5f /ChangeLog
parente4fd9de96df71fc3a808badb8e1f96f33a27bcca (diff)
merge revision(s) 41348:
* vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41363 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a0ac3e83ce..7db1894147 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 18 00:43:27 2013 Zachary Scott <zachary@zacharyscott.net>
+
+ * vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1
+
Tue Jun 18 00:34:57 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
merge revision(s) 41347: [Backport #5048] [Backport #5465] [Backport #8319]