summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-24 07:16:52 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-24 07:16:52 +0000
commit9d1d2816aab7b2b4542a36fbfc085b3292fe00f1 (patch)
tree712427d89e78ed12e3137fb99803f9e95bebcc9b /ChangeLog
parent8cc81b3a6c473baaa543aca68df7e4d798a3eeeb (diff)
merge revision(s) 16763:
* lib/erb.rb (ERB::Compiler::TrimScanner#explicit_trim_line): Fix without strscan problems. [ruby_core:17028]. * test/erb/test_erb.rb (TestERBCoreWOStrScan): Add test class for without strscan. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6fd7172f66..d8ec7e7c8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jun 24 15:38:52 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * lib/erb.rb (ERB::Compiler::TrimScanner#explicit_trim_line): Fix
+ without strscan problems. [ruby_core:17028].
+
+ * test/erb/test_erb.rb (TestERBCoreWOStrScan): Add test class for
+ without strscan.
+
Sun Jun 22 00:09:20 2008 Akinori MUSHA <knu@iDaemons.org>
* lib/delegate.rb (DelegateClass, Delegator#respond_to?):