summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-06 00:12:24 +0000
committerzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-06 00:12:24 +0000
commit7fdb955c36db70a17fbd46ad1f9c5f3d156682b2 (patch)
tree09f57007440b9c114fea26d6c2e0b5a58b6a65f5 /ChangeLog
parentcd171e481ffaf1a5ebfe9b3e1c13ec12afbb6216 (diff)
Backport r47425
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47428 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 f662581361..c2c0d5dfa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 6 09:10:45 2014 Zachary Scott <e@zzak.io>
+
+ * lib/rdoc/generator/template/darkfish/js/jquery.js: Backport
+ rdoc/rdoc@74f60fcb04fee1778fe2694d1a0ea6513f8e67b7
+
Fri Sep 5 14:08:00 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_create_dcom): use the converted