ruby-changes:31410
From: usa <ko1@a...>
Date: Thu, 31 Oct 2013 23:41:01 +0900 (JST)
Subject: [ruby-changes:31410] usa:r43489 (ruby_1_9_3): merge revision(s) 42994: [Backport #8913]
usa 2013-10-31 23:40:55 +0900 (Thu, 31 Oct 2013) New Revision: 43489 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43489 Log: merge revision(s) 42994: [Backport #8913] * lib/gserver.rb: [DOC] correct gserver.rb license [Bug #8913] Modified directories: branches/ruby_1_9_3/ Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/lib/gserver.rb branches/ruby_1_9_3/version.h Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 43488) +++ ruby_1_9_3/ChangeLog (revision 43489) @@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1 +Thu Oct 31 23:40:43 2013 Zachary Scott <e@z...> + + * lib/gserver.rb: [DOC] correct gserver.rb license [Bug #8913] + Thu Oct 31 23:35:12 2013 Nobuyoshi Nakada <nobu@r...> * vsnprintf.c (MAXEXP, MAXFRACT): calculate depending on constants in Index: ruby_1_9_3/lib/gserver.rb =================================================================== --- ruby_1_9_3/lib/gserver.rb (revision 43488) +++ ruby_1_9_3/lib/gserver.rb (revision 43489) @@ -3,7 +3,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/gserver.rb#L3 # # Author:: John W. Small # Documentation:: Gavin Sinclair -# Licence:: Freeware. +# Licence:: Ruby License require "socket" require "thread" Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 43488) +++ ruby_1_9_3/version.h (revision 43489) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1 #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 477 +#define RUBY_PATCHLEVEL 478 #define RUBY_RELEASE_DATE "2013-10-31" #define RUBY_RELEASE_YEAR 2013 Property changes on: ruby_1_9_3 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r42994 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/