From c2ae84bc4a44d8e66f4fe3cfdbe4791493b66745 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 11 Feb 2012 06:39:40 +0000 Subject: [PATCH] merge revisions 32532,32534: * ChangeLog: fix typos. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++-- version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7743fbdb96..664d3f0a2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2476,7 +2476,7 @@ Sun Jul 10 15:58:12 2011 NARUSE, Yui Sun Jul 10 16:41:32 2011 KOSAKI Motohiro * vm_core.h (typedef struct rb_vm_struct): create a new - 'inhibit_thread_createion' field. + 'inhibit_thread_creation' field. * thread.c (rb_thread_terminate_all): set inhibit_thread_creation. * thread.c (thread_s_new): don't permit to create new thread if the VM is under destruction. Otherwise evil finalizer code @@ -2638,7 +2638,7 @@ Fri Jul 8 15:53:31 2011 Nobuyoshi Nakada Fri Jul 8 15:01:06 2011 NAKAMURA Usaku * ext/openssl/ossl.h: include openssl/e_os2.h before checking the - defition of OPENSSL_SYS_WIN32. + definition of OPENSSL_SYS_WIN32. Fri Jul 8 14:40:39 2011 NAKAMURA Usaku diff --git a/version.h b/version.h index 117603d82f..e891ccad2a 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 94 +#define RUBY_PATCHLEVEL 95 #define RUBY_RELEASE_DATE "2012-02-11" #define RUBY_RELEASE_YEAR 2012