yugui	2010-12-23 21:45:22 +0900 (Thu, 23 Dec 2010)

  New Revision: 30316

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30316

  Log:
    merges r30117 from trunk into ruby_1_9_2.
    --
    * lib/rexml/light/node.rb: remove circular require.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/rexml/light/node.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30315)
+++ ruby_1_9_2/ChangeLog	(revision 30316)
@@ -1,3 +1,7 @@
+Tue Dec  7 21:59:37 2010  Kouhei Sutou  <kou@c...>
+
+	* lib/rexml/light/node.rb: remove circular require.
+
 Tue Dec  7 18:56:52 2010  NARUSE, Yui  <naruse@r...>
 
 	* ext/nkf/lib/kconv.rb (String#kconv): fix typo and update rdoc.
Index: ruby_1_9_2/lib/rexml/light/node.rb
===================================================================
--- ruby_1_9_2/lib/rexml/light/node.rb	(revision 30315)
+++ ruby_1_9_2/lib/rexml/light/node.rb	(revision 30316)
@@ -1,5 +1,4 @@
 require 'rexml/xmltokens'
-require 'rexml/light/node'
 
 # [ :element, parent, name, attributes, children* ]
   # a = Node.new
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30315)
+++ ruby_1_9_2/version.h	(revision 30316)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 121
+#define RUBY_PATCHLEVEL 122
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/