summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-06 00:04:18 +0000
committerzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-06 00:04:18 +0000
commit25552e2ab20d22d55e0d7baa0ff3fc9d38706246 (patch)
treeeea01a6440e5696e6054d6214ec5f84a67ab5a47 /ChangeLog
parentc44e4364990321e47a7b1a546764dc158504edf5 (diff)
Backport r47425
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47426 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 95af1b3908..0d5adc49d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 5 17:01:38 2014 Zachary Scott <e@zzak.io>
+
+ * lib/rdoc/generator/template/darkfish/js/jquery.js: Backport
+ rdoc/rdoc@74f60fcb04fee1778fe2694d1a0ea6513f8e67b7
+
Sat Sep 6 00:57:07 2014 Eric Wong <e@80x24.org>
* ext/zlib/zlib.c (gzfile_reset): preserve ZSTREAM_FLAG_GZFILE