aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-08 01:04:07 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-08 01:04:07 +0000
commit1a991ffebcd51ffd0df80a82c2b5fe4c65f2d2c0 (patch)
tree902b1efa51a69a2bf2d292a18e6ada80c61043e5 /ChangeLog
parent460c8907c99e2b90a5fb0cb6c18f2537fd4e60e1 (diff)
downloadruby-1a991ffebcd51ffd0df80a82c2b5fe4c65f2d2c0.tar.gz
* tool/merger.rb: don't abort, update first.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 97ce436471..e907d63f9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 8 09:49:58 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * tool/merger.rb: don't abort, update first.
+
Wed Feb 08 09:57:33 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
* ext/openssl/ossl_asn1.c: Call INT2NUM only once for GeneralString.