aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index feaebd3001..7511b2e855 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,7 +74,7 @@ Sat Oct 1 19:19:34 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (compile_flip_flop): simplify generated code.
* compile.c (compile_branch_condition): flip-flop can appear only
- in coditional expressions.
+ in conditional expressions.
Sat Oct 1 02:02:02 2016 NAKAMURA Usaku <usa@ruby-lang.org>
@@ -83,7 +83,7 @@ Sat Oct 1 02:02:02 2016 NAKAMURA Usaku <usa@ruby-lang.org>
Fri Sep 30 19:06:21 2016 Anton Davydov <mail@davydovanton.com>
- * lib/uri/http.rb: Documentation and code style imrovements.
+ * lib/uri/http.rb: Documentation and code style improvements.
* test/uri/test_http.rb: Added test for coverage.
[fix GH-1427][ruby-core:77255][Misc #12756]