1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fb80b0c17..c4b854826d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 29 19:12:46 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): -W command line option should be able to
+	  override -w in RUBYOPT environment variable.
+
 Tue Dec 29 17:54:16 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (ignored_block): warn if a block is given to `using`,