naruse	2012-02-11 06:14:03 +0900 (Sat, 11 Feb 2012)

  New Revision: 34548

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

  Log:
    merge revision(s) 34547:
    
    * dir.c (fnmatch): The * needs to be escaped to avoid formatting in
      fnmatch comment.
      patched by @dalton. https://github.com/ruby/ruby/pull/91

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/dir.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34547)
+++ ruby_1_9_3/ChangeLog	(revision 34548)
@@ -1,3 +1,9 @@
+Sat Feb 11 06:13:07 2012  NARUSE, Yui  <naruse@r...>
+
+	* dir.c (fnmatch): The * needs to be escaped to avoid formatting in
+	  fnmatch comment.
+	  patched by @dalton. https://github.com/ruby/ruby/pull/91
+
 Sat Feb 11 03:38:48 2012  Hiroshi Shirosaki <h.shirosaki@g...>
 
 	* io.c (rb_sys_fail_path): move the definition.
Index: ruby_1_9_3/dir.c
===================================================================
--- ruby_1_9_3/dir.c	(revision 34547)
+++ ruby_1_9_3/dir.c	(revision 34548)
@@ -1911,7 +1911,7 @@
  *                          match all files beginning with
  *                          <code>c</code>; <code>*c</code> will match
  *                          all files ending with <code>c</code>; and
- *                          <code>*c*</code> will match all files that
+ *                          <code>\*c*</code> will match all files that
  *                          have <code>c</code> in them (including at
  *                          the beginning or end). Equivalent to
  *                          <code>/ .* /x</code> in regexp.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34547)
+++ ruby_1_9_3/version.h	(revision 34548)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 92
+#define RUBY_PATCHLEVEL 93
 
 #define RUBY_RELEASE_DATE "2012-02-11"
 #define RUBY_RELEASE_YEAR 2012

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