diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-25 14:48:47 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-25 14:48:47 +0000 |
commit | 3806abfecf6e5c15ffa9749202bc5664ae6e0f37 (patch) | |
tree | 9566454d184e94aaebcfc74219c61d8b7374f885 | |
parent | 0f377c1c1038d3a56f1fa5508127b96fd1f43c6d (diff) |
merge revision(s) 34792:
* file.c (utime_internal): fix a variable missed to replace.
[ruby-core:42864] [Bug #6077]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | file.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Feb 25 23:47:49 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (utime_internal): fix a variable missed to replace. + [ruby-core:42864] [Bug #6077] + Sat Feb 25 21:29:09 2012 URABE Shyouhei <shyouhei@ruby-lang.org> * test/ruby/test_literal.rb (TestRubyLiteral#test_special_const): @@ -2268,7 +2268,7 @@ utime_internal(const char *path, VALUE pathv, void *arg) try_utimensat = 0; goto no_utimensat; } - utime_failed(path, tsp, v->atime, v->mtime); + utime_failed(pathv, tsp, v->atime, v->mtime); } return; } @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 148 +#define RUBY_PATCHLEVEL 149 #define RUBY_RELEASE_DATE "2012-02-25" #define RUBY_RELEASE_YEAR 2012 |