1 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a1400bd4..1d10ac281 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Tue Nov 11 23:24:23 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ruby.c: merges r20053 and r20067 from trunk into ruby_1_9_1.
+
+	* ruby.c (moreswitches): splits option string and passes arguments.
+
+	* ruby.c (proc_options): checks if allowed in RUBYOPT.
+
+	* ruby.c (process_options): allows long style options in RUBYOPT.
+
+	* ruby.c (load_file_internal): ditto in shebang.  [ruby-dev:36979]
+
+	* ruby.c (process_options): delays setting safe level.
+	  [ruby-dev:36997]
+
 Tue Nov 11 23:36:45 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_accept): commit miss.