summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-19 16:44:08 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-19 16:44:08 +0000
commite498d6e0a7af7ab0d1ccf666d44da31cd0f562ff (patch)
treeab654037f6d6fe9b4c3a802fc66a939af6b9577e /ext
parent09774c7aa411f77e776e87308919463733441c23 (diff)
downloadruby-e498d6e0a7af7ab0d1ccf666d44da31cd0f562ff.tar.gz
ruby-e498d6e0a7af7ab0d1ccf666d44da31cd0f562ff.tar.xz
ruby-e498d6e0a7af7ab0d1ccf666d44da31cd0f562ff.zip
* file.c (rb_thread_flock): should have resolved conflict.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
0 files changed, 0 insertions, 0 deletions