1 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 91f0672943..f9be417990 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Sun Sep 27 15:43:59 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): override compile option by option
+	  given by pragma.
+
+	* iseq.c (rb_iseq_make_compile_option): extract a function to
+	  overwrite rb_compile_option_t.
+
+	* parse.y (parser_set_compile_option_flag): introduce pragma to
+	  override compile options.
+
+	* parse.y (magic_comments): new pragma "fronzen-string-literal".
+	  [Feature #8976]
+
 Sun Sep 27 08:16:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/ostruct.rb (delete_field): do not raise NameError for