yugui	2010-11-15 20:43:14 +0900 (Mon, 15 Nov 2010)

  New Revision: 29791

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

  Log:
    merges r29223 from trunk into ruby_1_9_2.
    --
    * include/ruby/intern.h (rb_set_kcode, rb_get_kcode): removed
      zombie prototype declarations.  a patch from Eric Hodel
      at [ruby-core:32305].

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/include/ruby/intern.h
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/include/ruby/intern.h
===================================================================
--- ruby_1_9_2/include/ruby/intern.h	(revision 29790)
+++ ruby_1_9_2/include/ruby/intern.h	(revision 29791)
@@ -563,8 +563,6 @@
 VALUE rb_reg_match(VALUE, VALUE);
 VALUE rb_reg_match2(VALUE);
 int rb_reg_options(VALUE);
-void rb_set_kcode(const char*);
-const char* rb_get_kcode(void);
 /* ruby.c */
 #define rb_argv rb_get_argv()
 RUBY_EXTERN VALUE rb_argv0;
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29790)
+++ ruby_1_9_2/ChangeLog	(revision 29791)
@@ -1,3 +1,9 @@
+Sat Sep 11 12:32:05 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/intern.h (rb_set_kcode, rb_get_kcode): removed
+	  zombie prototype declarations.  a patch from Eric Hodel
+	  at [ruby-core:32305].
+
 Thu Sep  9 23:25:53 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm.c (vm_backtrace_each): skip allocator frames which have no
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29790)
+++ ruby_1_9_2/version.h	(revision 29791)
@@ -1,13 +1,13 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 35
+#define RUBY_PATCHLEVEL 36
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
 
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 2
-#define RUBY_RELEASE_DATE "2010-11-02"
+#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DATE "2010-11-15"
 
 #include "ruby/version.h"
 

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