summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-30 10:32:16 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-30 10:32:16 +0000
commit1bb25b049884b1eccd31a347898533c7cf68f9d5 (patch)
tree05168404e8a601bafa537332ec49ed88170de891 /ChangeLog
parent7c74420ddce43e40741ad9408d11596417cafb82 (diff)
merges r21171 from trunk into ruby_1_9_1.
* bin/erb: accepts options in more flexible styles. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ddb60d91df..dedcb87a15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 29 17:53:24 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * bin/erb: accepts options in more flexible styles.
+
Mon Dec 29 17:25:17 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* lib/erb.rb (ERB): m17n of ERB. adds rdoc.