usa	2014-02-14 15:51:49 +0900 (Fri, 14 Feb 2014)

  New Revision: 44947

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

  Log:
    merge revision(s) 44514: [Backport #9374]
    
    * ext/json/generator/depend: add build dependencies for json extension
      [Bug #9374] [ruby-core:59609]
    
    * ext/json/parser/depend: ditto

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/json/generator/depend
    branches/ruby_1_9_3/ext/json/parser/depend
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 44946)
+++ ruby_1_9_3/ChangeLog	(revision 44947)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Fri Feb 14 15:49:55 2014  Eric Wong <e@8...>
+
+	* ext/json/generator/depend: add build dependencies for json extension
+	  [Bug #9374] [ruby-core:59609]
+	* ext/json/parser/depend: ditto
+
 Fri Feb 14 15:40:32 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* iseq.c (iseq_load): keep type_map to get rid of memory leak.
Index: ruby_1_9_3/ext/json/generator/depend
===================================================================
--- ruby_1_9_3/ext/json/generator/depend	(revision 44946)
+++ ruby_1_9_3/ext/json/generator/depend	(revision 44947)
@@ -1 +1,2 @@
+$(OBJS): $(ruby_headers)
 generator.o: generator.c generator.h
Index: ruby_1_9_3/ext/json/parser/depend
===================================================================
--- ruby_1_9_3/ext/json/parser/depend	(revision 44946)
+++ ruby_1_9_3/ext/json/parser/depend	(revision 44947)
@@ -1 +1,2 @@
+$(OBJS): $(ruby_headers)
 parser.o: parser.c parser.h
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 44946)
+++ ruby_1_9_3/version.h	(revision 44947)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 527
+#define RUBY_PATCHLEVEL 528
 
 #define RUBY_RELEASE_DATE "2014-02-14"
 #define RUBY_RELEASE_YEAR 2014

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44514


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