nagachika	2013-03-04 23:54:40 +0900 (Mon, 04 Mar 2013)

  New Revision: 39583

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

  Log:
    merge revision(s) 39291:
    
    * configure.in: remove debug print.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/configure.in
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/configure.in
===================================================================
--- ruby_2_0_0/configure.in	(revision 39582)
+++ ruby_2_0_0/configure.in	(revision 39583)
@@ -2377,13 +2377,11 @@ AC_ARG_WITH(opt-dir, https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L2377
 	[
 		val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //"`
 		CPPFLAGS="$CPPFLAGS $val"
-		set -x
 		val=`IFS="$PATH_SEPARATOR"
 		    for dir in $withval; do
 			echo x ${LIBPATHFLAG} ${RPATHFLAG} |
 			sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g"
 		    done | tr '\012' ' '`
-		set +x
 		LDFLAGS_OPTDIR="$val"
 		LDFLAGS="$LDFLAGS${LDFLAGS:+ }$val"
 		DLDFLAGS="$DLDFLAGS${DLDFLAGS:+ }$val"
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39582)
+++ ruby_2_0_0/ChangeLog	(revision 39583)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Mar  4 23:53:18 2013  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	(merge r39291)
+	* configure.in (opt-dir): remove debug print.
+
 Mon Mar  4 23:42:34 2013  Zachary Scott  <zachary@z...>
 
 	* ext/psych/lib/psych/y.rb: Document Kernel#y by Adam Stankiewicz
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39582)
+++ ruby_2_0_0/version.h	(revision 39583)
@@ -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-04"
-#define RUBY_PATCHLEVEL 12
+#define RUBY_PATCHLEVEL 13
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

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


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