diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-04 11:53:33 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-04 11:53:33 +0000 |
| commit | 36860a2f6c125f277d4fdb5a8541b04e0e9973d3 (patch) | |
| tree | b7439f4b8113ad9f6f5e3c13bced75cab563a8fa /ChangeLog | |
| parent | 549c6484d1dbe58aa39c830c1fe47702a2462ac3 (diff) | |
merges r20850, r17881, r16811, r16763, r16748, r15829, r15794 and r15698
from ruby_1_8 into ruby_1_9_1..
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Sun Jan 4 00:30:50 2009 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> + + * lib/erb.rb: merged r20850, r17881, r16811, r16763, r16748, r15829, + r15794 and r15698 from ruby_1_8. + + * test/erb/test_erb.rb: ditto. + Sat Jan 3 22:24:36 2009 NAKAMURA Usaku <usa@ruby-lang.org> * common.mk, Makefile.in, win32/Makefile.sub (INSNS): move the macro |