nagachika	2013-03-09 22:55:21 +0900 (Sat, 09 Mar 2013)

  New Revision: 39668

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

  Log:
    merge revision(s) 39425:
    
    merger.rb: runnable
    
    * tool/merger.rb: make runnable.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/tool/merger.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39667)
+++ ruby_2_0_0/version.h	(revision 39668)
@@ -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-09"
-#define RUBY_PATCHLEVEL 37
+#define RUBY_PATCHLEVEL 38
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_0_0/tool/merger.rb
===================================================================
--- ruby_2_0_0/tool/merger.rb	(revision 39667)
+++ ruby_2_0_0/tool/merger.rb	(revision 39668)
@@ -1,4 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/merger.rb#L1
-#! /bin/ruby
+#!/bin/sh
+# -*- ruby -*-
+exec "${RUBY-ruby}" "-x" "$0" "$@" && [ ] if false
+#!ruby
 # This needs ruby 1.9 and subversion.
 # run this in a repository to commit.
 

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


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