From 929bdcabf7a292da3e1bedab97926f7d932d2d64 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 23 Dec 2010 12:45:22 +0000 Subject: merges r30117 from trunk into ruby_1_9_2. -- * lib/rexml/light/node.rb: remove circular require. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30316 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/rexml/light/node.rb | 1 - version.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d46209839..2e9c65f888 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Dec 7 21:59:37 2010 Kouhei Sutou + + * lib/rexml/light/node.rb: remove circular require. + Tue Dec 7 18:56:52 2010 NARUSE, Yui * ext/nkf/lib/kconv.rb (String#kconv): fix typo and update rdoc. diff --git a/lib/rexml/light/node.rb b/lib/rexml/light/node.rb index 9c90148c05..c8701f3abb 100644 --- a/lib/rexml/light/node.rb +++ b/lib/rexml/light/node.rb @@ -1,5 +1,4 @@ require 'rexml/xmltokens' -require 'rexml/light/node' # [ :element, parent, name, attributes, children* ] # a = Node.new diff --git a/version.h b/version.h index 172a4bf117..d96f840a0d 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3