usa	2015-05-29 14:03:43 +0900 (Fri, 29 May 2015)

  New Revision: 50670

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

  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_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/bigdecimal/bigdecimal.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 50669)
+++ ruby_2_1/ChangeLog	(revision 50670)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Fri May 29 14:03:33 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 May 29 14:00:16 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* win32/file.c (rb_file_expand_path_internal): neither the drive
Index: ruby_2_1/ext/bigdecimal/bigdecimal.c
===================================================================
--- ruby_2_1/ext/bigdecimal/bigdecimal.c	(revision 50669)
+++ ruby_2_1/ext/bigdecimal/bigdecimal.c	(revision 50670)
@@ -4386,7 +4386,7 @@ VpSetPTR(Real *a, Real *b, Real *c, size https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/bigdecimal/bigdecimal.c#L4386
 
     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_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 50669)
+++ ruby_2_1/version.h	(revision 50670)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.7"
 #define RUBY_RELEASE_DATE "2015-05-29"
-#define RUBY_PATCHLEVEL 361
+#define RUBY_PATCHLEVEL 362
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 5

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


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