From 8f94d406b090193d014cb8f84c2a120cd24fe279 Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 4 Mar 2013 15:35:07 +0000 Subject: merge revision(s) 39317 partially: * ChangeLog: fix a typo. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39585 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 616e2059b0..5505dc53e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -217,7 +217,7 @@ Wed Feb 20 17:02:12 2013 Koichi Sasada Wed Feb 20 08:05:25 2013 Nobuyoshi Nakada - * compar.c (rb_invcmp): compare by inversed comarison, with preventing + * compar.c (rb_invcmp): compare by inversed comparison, with preventing from infinite recursion. [ruby-core:52305] [Bug #7870] * string.c (rb_str_cmp_m), time.c (time_cmp): get rid of infinite diff --git a/version.h b/version.h index e0b1d7d7bb..97db613d95 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-03-05" -#define RUBY_PATCHLEVEL 14 +#define RUBY_PATCHLEVEL 15 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3 -- cgit v1.2.3