nagachika	2013-03-03 02:28:03 +0900 (Sun, 03 Mar 2013)

  New Revision: 39567

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

  Log:
    merge revision(s) 39253:
    
    win32.c: style
    
    * win32/win32.c (rb_w32_fd_is_text): adjust style.

  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 39566)
+++ ruby_2_0_0/win32/win32.c	(revision 39567)
@@ -6582,7 +6582,8 @@ rb_w32_inet_ntop(int af, const void *add https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/win32/win32.c#L6582
 
 /* License: Ruby's */
 char
-rb_w32_fd_is_text(int fd) {
+rb_w32_fd_is_text(int fd)
+{
     return _osfile(fd) & FTEXT;
 }
 
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39566)
+++ ruby_2_0_0/version.h	(revision 39567)
@@ -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-03-03"
-#define RUBY_PATCHLEVEL 6
+#define RUBY_PATCHLEVEL 7
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

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


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