diff options
| author | why <why@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-07 19:38:22 +0000 |
|---|---|---|
| committer | why <why@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-07 19:38:22 +0000 |
| commit | 80656044e3320ad959981366cda413cb71322a9b (patch) | |
| tree | 2252af28a0e1788958f160a4b6b570bbd53ad311 | |
| parent | b25428948977c6ef6b9cf203ee5f6e70f111b1cd (diff) | |
| download | ruby-80656044e3320ad959981366cda413cb71322a9b.tar.gz ruby-80656044e3320ad959981366cda413cb71322a9b.tar.xz ruby-80656044e3320ad959981366cda413cb71322a9b.zip | |
* ChangeLog: left a conflict indicator in there, sorry.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -257,7 +257,6 @@ Fri Dec 24 02:22:53 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/syck/rubyext.c (syck_emitter_s_alloc, syck_emitter_initialize): ditto. ->>>>>>> 1.2673.2.773 Fri Dec 24 01:21:00 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/lib/tkextlib/blt.rb: add BLT extension support |