naruse	2015-01-01 08:38:01 +0900 (Thu, 01 Jan 2015)

  New Revision: 49087

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

  Log:
    merge revision(s) 49042: [Backport #10657]
    
    * cygwin/GNUmakefile.in (EXTOBJS): override to add resource files
      always.  [ruby-core:67153] [Bug #10657]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/cygwin/GNUmakefile.in
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49086)
+++ ruby_2_2/ChangeLog	(revision 49087)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Thu Jan  1 08:29:55 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* cygwin/GNUmakefile.in (EXTOBJS): override to add resource files
+	  always.  [ruby-core:67153] [Bug #10657]
+
 Wed Dec 31 15:26:46 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (f_kwrest, new_args_tail_gen): unnamed rest keyword and
Index: ruby_2_2/cygwin/GNUmakefile.in
===================================================================
--- ruby_2_2/cygwin/GNUmakefile.in	(revision 49086)
+++ ruby_2_2/cygwin/GNUmakefile.in	(revision 49087)
@@ -33,7 +33,7 @@ WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT https://github.com/ruby/ruby/blob/trunk/ruby_2_2/cygwin/GNUmakefile.in#L33
 -include uncommon.mk
 
 SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
-EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
+override EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
 RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
 RUBYDEF = $(DLL_BASE_NAME).def
 
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49086)
+++ ruby_2_2/version.h	(revision 49087)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
-#define RUBY_RELEASE_DATE "2014-12-31"
-#define RUBY_PATCHLEVEL 4
+#define RUBY_RELEASE_DATE "2015-01-01"
+#define RUBY_PATCHLEVEL 5
 
-#define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_YEAR 2015
+#define RUBY_RELEASE_MONTH 1
+#define RUBY_RELEASE_DAY 1
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49042


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