summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ext/date/date_core.c2
-rw-r--r--version.h6
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7db20f6b3a..5031faac95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 11 11:18:57 2013 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * ext/date/date_core.c: [ruby-core:52303]
+
Thu Apr 4 16:21:39 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/objspace/objspace.c (count_nodes): fix key for unknown node.
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index c22a9d496c..4048d1345d 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -7864,7 +7864,7 @@ datetime_s_now(int argc, VALUE *argv, VALUE klass)
of = tm.tm_gmtoff;
#elif defined(HAVE_VAR_TIMEZONE)
#ifdef HAVE_VAR_ALTZONE
- of = (long)((tm.tm_isdst > 0) ? altzone : timezone);
+ of = (long)-((tm.tm_isdst > 0) ? altzone : timezone);
#else
of = (long)-timezone;
if (tm.tm_isdst) {
diff --git a/version.h b/version.h
index e10e54d762..3d1b5f19b7 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 411
+#define RUBY_PATCHLEVEL 412
-#define RUBY_RELEASE_DATE "2013-04-09"
+#define RUBY_RELEASE_DATE "2013-04-11"
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 11
#include "ruby/version.h"