From cd28b651db1903f5960200f238b1047978e1b5e4 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 2 Dec 2010 08:05:54 +0000 Subject: merges r29410 from trunk into ruby_1_9_2. -- * parse.y (regexp): dregexp has literal string only at the head and successors are array. [ruby-core:32682] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d348b2e9f6..f71d3780de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 4 12:43:47 2010 Nobuyoshi Nakada + + * parse.y (regexp): dregexp has literal string only at the head + and successors are array. [ruby-core:32682] + Mon Oct 4 09:30:42 2010 NARUSE, Yui * ext/openssl/lib/openssl/bn.rb (Integer#to_bn): OpenSSL::BN.new diff --git a/version.h b/version.h index 7c34855974..751d72768a 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 59 +#define RUBY_PATCHLEVEL 60 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3