summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-06 13:14:46 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-06 13:14:46 +0000
commit22e2bfc646dc7856d2f0a4b5d578db90af83fa75 (patch)
treea97025733e383f0e83001b1934a1f65441394284 /ChangeLog
parent3c8784c201051a3a7cc36e31b99c63dae0e547e0 (diff)
merge revision(s) 39297: [Backport #8032]
mkconfig.rb: clear exec_prefix * tool/mkconfig.rb: clear exec_prefix which may differ from prefix, before expanding rubyarchdir to remove prefix. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 15e56fea4c..570fc22eb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Mar 6 22:13:38 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+
+merge revision(s) 39297: [Backport #8032]
+
+ * tool/mkconfig.rb: clear exec_prefix which may differ from prefix,
+ before expanding rubyarchdir to remove prefix.
+
Tue Mar 5 01:20:39 2013 NARUSE, Yui <naruse@ruby-lang.org>
* tool/merger.rb: add interaction when only ChangeLog is modified.