yugui	2010-10-02 20:19:55 +0900 (Sat, 02 Oct 2010)

  New Revision: 29388

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

  Log:
    merges r29076 from trunk into ruby_1_9_2.
    --
    * common.mk (version.o): depends on both of version.h and
      include/ruby/version.h.   [ruby-dev:42063]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/common.mk
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29387)
+++ ruby_1_9_2/ChangeLog	(revision 29388)
@@ -1,3 +1,8 @@
+Mon Aug 23 22:30:58 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (version.o): depends on both of version.h and
+	  include/ruby/version.h.   [ruby-dev:42063]
+
 Mon Aug 23 12:28:58 2010  NARUSE, Yui  <naruse@r...>
 
 	* re.c (rb_reg_search): fix: 4th argument should be regexp
Index: ruby_1_9_2/common.mk
===================================================================
--- ruby_1_9_2/common.mk	(revision 29387)
+++ ruby_1_9_2/common.mk	(revision 29388)
@@ -637,7 +637,7 @@
   {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}encoding.h \
   {$(VPATH)}oniguruma.h
 version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}version.h $(srcdir)/revision.h {$(VPATH)}config.h
+  {$(VPATH)}version.h $(srcdir)/version.h $(srcdir)/revision.h {$(VPATH)}config.h
 dmyversion.$(OBJEXT): {$(VPATH)}dmyversion.c version.$(OBJEXT)
 
 compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29387)
+++ ruby_1_9_2/version.h	(revision 29388)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.2"
 #define RUBY_RELEASE_DATE "2010-10-02"
-#define RUBY_PATCHLEVEL 8
+#define RUBY_PATCHLEVEL 9
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9

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