From 096845e09f2a41943d97bbab3bb58d171679eaa2 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 19 Dec 2008 11:37:41 +0000
Subject: merges r20859 from trunk into ruby_1_9_1. * lib/optparse/version.rb:
 remove variable shadowing to stop   warning.   [ruby-core:20612]

* lib/irb/completion.rb, lib/net/imap.rb, lib/prime.rb,
  lib/rinda/ring.rb, lib/racc/parser.rb,
  lib/shell/command-processor.rb, lib/yaml/yamlnode.rb: ditto.

* lib/racc/parser.rb: remove space before parentheses.

* lib/shell/command-processor.rb, lib/shell/process-controller.rb:
  use parentheses around arguments.

* lib/irb/ext/change-ws.rb, lib/rexml/validation/relaxng.rb,
  lib/yaml/baseemitter.rb: indentation fix.

* lib/matrix.rb: small cosmetic change.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index cd824bc43..6d57566ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Thu Dec 18 16:48:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/optparse/version.rb: remove variable shadowing to stop
+	  warning.   [ruby-core:20612]
+
+	* lib/irb/completion.rb, lib/net/imap.rb, lib/prime.rb,
+	  lib/rinda/ring.rb, lib/racc/parser.rb,
+	  lib/shell/command-processor.rb, lib/yaml/yamlnode.rb: ditto.
+
+	* lib/racc/parser.rb: remove space before parentheses.
+
+	* lib/shell/command-processor.rb, lib/shell/process-controller.rb:
+	  use parentheses around arguments.
+
+	* lib/irb/ext/change-ws.rb, lib/rexml/validation/relaxng.rb,
+	  lib/yaml/baseemitter.rb: indentation fix.
+
+	* lib/matrix.rb: small cosmetic change.
+
 Thu Dec 18 08:15:04 2008  James Edward Gray II  <jeg2@ruby-lang.org>
 
 	* lib/xmlrpc/server.rb:  Restricting method inspection to show only
-- 
cgit