naruse	2015-02-21 12:46:03 +0900 (Sat, 21 Feb 2015)

  New Revision: 49670

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

  Log:
    merge revision(s) 49491: [Backport #10823]
    
    * ext/bigdecimal/bigdecimal.c (VpSetPTR): fix a typo, 'expoennt'
      to 'exponent'.  [ruby-core:67980] [Bug #10823] [Fix GH-825]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/bigdecimal/bigdecimal.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49669)
+++ ruby_2_2/ChangeLog	(revision 49670)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sat Feb 21 12:45:54 2015  Matt Hoyle  <matt@d...>
+
+	* ext/bigdecimal/bigdecimal.c (VpSetPTR): fix a typo, 'expoennt'
+	  to 'exponent'.  [ruby-core:67980] [Bug #10823] [Fix GH-825]
+
 Fri Feb 20 17:47:20 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_core.h (rb_call_info_kw_arg_struct): make keywords a symbols
Index: ruby_2_2/ext/bigdecimal/bigdecimal.c
===================================================================
--- ruby_2_2/ext/bigdecimal/bigdecimal.c	(revision 49669)
+++ ruby_2_2/ext/bigdecimal/bigdecimal.c	(revision 49670)
@@ -4418,7 +4418,7 @@ VpSetPTR(Real *a, Real *b, Real *c, size https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/bigdecimal/bigdecimal.c#L4418
 
     size_t const round_limit = (VpGetPrecLimit() + BASE_FIG - 1) / BASE_FIG;
 
-    assert(a->exponent >= b->expoennt);
+    assert(a->exponent >= b->exponent);
 
     c->frac[0] = 0;
     *av = *bv = 0;
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49669)
+++ ruby_2_2/version.h	(revision 49670)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
-#define RUBY_RELEASE_DATE "2015-02-20"
-#define RUBY_PATCHLEVEL 70
+#define RUBY_RELEASE_DATE "2015-02-21"
+#define RUBY_PATCHLEVEL 71
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49491


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