diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-19 16:44:08 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-19 16:44:08 +0000 |
| commit | a6eb4609c215fb04b9b5a40bd065826c7b6f1954 (patch) | |
| tree | ab654037f6d6fe9b4c3a802fc66a939af6b9577e /ChangeLog | |
| parent | 75ee37707e1c8cc8431b102b80098a1d7679f8dd (diff) | |
* file.c (rb_thread_flock): should have resolved conflict.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions