summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-06 00:14:42 +0000
committerzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-06 00:14:42 +0000
commit779fa9601e05168f3976a8858426a0eabcab3d7e (patch)
treeff61bebf5624b51aab36eaa37a82485f754765a7 /ChangeLog
parentfac59ac780d6fba2107d2d74c7d2553c0cc81af9 (diff)
Backport r47425
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@47429 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 0883f56e2a..2dded70b60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 6 09:13:55 2014 Zachary Scott <e@zzak.io>
+
+ * lib/rdoc/generator/template/darkfish/js/jquery.js: Backport
+ rdoc/rdoc@74f60fcb04fee1778fe2694d1a0ea6513f8e67b7
+
Wed May 14 17:35:32 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* common.mk: need to quote $BASERUBY because it may includes options.