summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-12 07:35:32 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-12 07:35:32 +0000
commitf4df871a4f0d9af8f54870487b3624661aaaef26 (patch)
treea130f29476eb7a2a4f0936591ebf81cc6f875b36 /ChangeLog
parent7d86051f256eac912e47a205c8e6d6125141a188 (diff)
merge revision(s) 34568:
* tool/merger.rb (#default_merge_branch): Add support for Subversion 1.7 which adopted a whole new working directory structure. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34569 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 5603523387..c98583119b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb 12 16:34:55 2012 Akinori MUSHA <knu@iDaemons.org>
+
+ * tool/merger.rb (#default_merge_branch): Add support for
+ Subversion 1.7 which adopted a whole new working directory
+ structure.
+
Sun Feb 12 09:38:46 2012 Yukihiro Matsumoto <matz@ruby-lang.org>
* vm_method.c (rb_add_method): should not call method_added hook