nagachika	2013-03-10 00:02:03 +0900 (Sun, 10 Mar 2013)

  New Revision: 39676

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39676

  Log:
    merge revision(s) 39475: [Backport #7868]
    
    * ext/date/date_core.c: [ruby-core:52303]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/date/date_core.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39675)
+++ ruby_2_0_0/ChangeLog	(revision 39676)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Mar 10 00:01:07 2013  Tadayoshi Funaba  <tadf@d...>
+
+	* ext/date/date_core.c: [ruby-core:52303]
+
 Sat Mar  9 23:55:42 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* random.c (rb_random_ulong_limited): limit is inclusive, but generic
Index: ruby_2_0_0/ext/date/date_core.c
===================================================================
--- ruby_2_0_0/ext/date/date_core.c	(revision 39675)
+++ ruby_2_0_0/ext/date/date_core.c	(revision 39676)
@@ -7765,7 +7765,7 @@ datetime_s_now(int argc, VALUE *argv, VA https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/date/date_core.c#L7765
     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) {
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39675)
+++ ruby_2_0_0/version.h	(revision 39676)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-03-09"
-#define RUBY_PATCHLEVEL 45
+#define RUBY_RELEASE_DATE "2013-03-10"
+#define RUBY_PATCHLEVEL 46
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39475


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/