summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--include/ruby/intern.h2
-rw-r--r--version.h6
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 301fba0f40..e22a1137df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Sep 11 12:32:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* vm.c (vm_backtrace_each): skip allocator frames which have no
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index e46e19aac4..af97c2a9b8 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -563,8 +563,6 @@ VALUE rb_reg_init_str(VALUE re, VALUE s, int options);
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;
diff --git a/version.h b/version.h
index 8735f51c87..655c323f29 100644
--- a/version.h
+++ b/version.h
@@ -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"