diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-16 06:36:35 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-16 06:36:35 +0000 |
commit | 768cfdd50bf53bbb10498906a7aa49a91ca008db (patch) | |
tree | bebdd0a1279b82ac8bf4542dc005549b4b387133 | |
parent | ca90e7d844729e9abb9b31efcc8f2eec0d866a28 (diff) |
merge revision(s) 36620: [Backport #8791]
* ext/date/date_{core,strftime}.c: [ruby-core:46990].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@42581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ext/date/date_core.c | 4 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,7 @@ +Fri Aug 16 15:35:10 2013 Tadayoshi Funaba <tadf@dotrb.org> + + * ext/date/date_{core,strftime}.c: [ruby-core:46990]. + Wed Aug 14 09:56:55 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (have_framework): allow header file to check. diff --git a/ext/date/date_core.c b/ext/date/date_core.c index 307cc47c59..3b15ccde29 100644 --- a/ext/date/date_core.c +++ b/ext/date/date_core.c @@ -7030,7 +7030,7 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self, * * Seconds since the Unix Epoch: * %s - Number of seconds since 1970-01-01 00:00:00 UTC. - * %Q - Number of microseconds since 1970-01-01 00:00:00 UTC. + * %Q - Number of milliseconds since 1970-01-01 00:00:00 UTC. * * Literal string: * %n - Newline character (\n) @@ -8465,7 +8465,7 @@ dt_lite_to_s(VALUE self) * * Seconds since the Unix Epoch: * %s - Number of seconds since 1970-01-01 00:00:00 UTC. - * %Q - Number of microseconds since 1970-01-01 00:00:00 UTC. + * %Q - Number of milliseconds since 1970-01-01 00:00:00 UTC. * * Literal string: * %n - Newline character (\n) @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 465 +#define RUBY_PATCHLEVEL 466 -#define RUBY_RELEASE_DATE "2013-08-14" +#define RUBY_RELEASE_DATE "2013-08-16" #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 14 +#define RUBY_RELEASE_DAY 16 #include "ruby/version.h" |