summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-26 04:26:16 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-26 04:26:16 +0000
commitf9a641fdd2d72f7fa7ffe5ad7f2f8e0cf6467af4 (patch)
treef05adf8035804ac0d9e5841290a88e2dfc0c5464 /ChangeLog
parenta29386aaabd32bc4018cdec2362f8e42d829b105 (diff)
merge revision(s) 54755: [Backport #12313]
* encoding.c: Fix return value of `Encoding::ISO8859_1.name` [Bug #12313][ruby-core:75147][ci skip] * ext/bigdecimal/bigdecimal.c: Fix code sample of `BigDecimal.new` git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 51ab17fa3f..dd1265d873 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Apr 26 13:25:25 2016 Marcus Stollsteimer <sto.mar@web.de>
+
+ * encoding.c: Fix return value of `Encoding::ISO8859_1.name`
+ [Bug #12313][ruby-core:75147][ci skip]
+ * ext/bigdecimal/bigdecimal.c: Fix code sample of `BigDecimal.new`
+
Tue Apr 26 13:22:45 2016 Rei Odaira <Rei.Odaira@gmail.com>
* configure.in: add missing -lm for AIX.