diff options
| author | ksaito <ksaito@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-04 14:57:11 +0000 |
|---|---|---|
| committer | ksaito <ksaito@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-04 14:57:11 +0000 |
| commit | 47548dd33e4cb2cd747f746262a4777bd214e485 (patch) | |
| tree | 12c581f24a20dc5083b3acb4419a697d83318391 /ChangeLog | |
| parent | 82cb9eaa3bb49a77df4452cfdff18f817ecf63a6 (diff) | |
| download | ruby-47548dd33e4cb2cd747f746262a4777bd214e485.tar.gz | |
* regexec.c, regparse.c, regint.h: fixed conflicts between vendor branch.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7207 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Thu Nov 4 23:54:21 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp> + + * regexec.c, regparse.c, regint.h: fixed conflicts between + vendor branch. + Thu Nov 4 23:41:55 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp> * ascii.c, euc_jp.c, oniggnu.h, oniguruma.h, regcomp.c, |