summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-07 04:21:20 +0000
committerzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-07 04:21:20 +0000
commit2db4ac6e2bdae58574438fc3081d5f1fda7fa430 (patch)
tree8ba93274b8ae06548f829c113534e0d010a2aaa3 /ChangeLog
parent5452c2d625a7ce337a81c2c88e7fdf6c453c5b42 (diff)
Commit ChangeLog from r38249
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38250 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 407aaa6d17..e10c94034d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 7 13:07:00 2012 Zachary Scott <zachary@zacharyscott.net>
+
+ * doc/forwardable.rd: Remove stale documentation file
+ * lib/forwardable.rb: Merge documentation from doc/forwardable.rd
+
Fri Dec 7 09:47:35 2012 NARUSE, Yui <naruse@ruby-lang.org>
* time.c (time_mdump): dump timezone string to private instance variable