summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-11 06:39:40 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-11 06:39:40 +0000
commitc2ae84bc4a44d8e66f4fe3cfdbe4791493b66745 (patch)
tree580c0338c163bd244e9b96a6ce0b2abb2a0f6aac /ChangeLog
parent83af59b8d6b57006125c2f2c455230d9a08ef250 (diff)
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
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 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 <naruse@ruby-lang.org>
Sun Jul 10 16:41:32 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* 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 <nobu@ruby-lang.org>
Fri Jul 8 15:01:06 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* 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 <usa@ruby-lang.org>