nagachika	2013-04-03 05:25:04 +0900 (Wed, 03 Apr 2013)

  New Revision: 40075

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

  Log:
    merge revision(s) 40069:
    
    win32.c: missing break
    
    * win32/win32.c (constat_attr): fix missing break.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/win32/win32.c

Index: ruby_2_0_0/win32/win32.c
===================================================================
--- ruby_2_0_0/win32/win32.c	(revision 40074)
+++ ruby_2_0_0/win32/win32.c	(revision 40075)
@@ -5629,6 +5629,7 @@ constat_attr(int count, const int *seq, https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/win32/win32.c#L5629
 
 	  case 40:
 	    attr &= ~(BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED);
+	    break;
 	  case 41:
 	    attr = attr & ~(BACKGROUND_BLUE | BACKGROUND_GREEN) | BACKGROUND_RED;
 	    break;
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40074)
+++ ruby_2_0_0/version.h	(revision 40075)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-03"
-#define RUBY_PATCHLEVEL 101
+#define RUBY_PATCHLEVEL 102
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40069


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