merge revision(s) 42994: [Backport #8913]

* lib/gserver.rb: [DOC] correct gserver.rb license [Bug #8913]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43060 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-09-26 16:00:20 +00:00
parent 72fb9d16dc
commit fe17a46edf
3 changed files with 8 additions and 4 deletions

View file

@ -1,3 +1,7 @@
Fri Sep 27 00:58:57 2013 Zachary Scott <e@zzak.io>
* lib/gserver.rb: [DOC] correct gserver.rb license [Bug #8913]
Sun Sep 15 23:15:32 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
* lib/rubygems: Update to Rubygems 2.0.9. [ruby-core:57183]

View file

@ -3,7 +3,7 @@
#
# Author:: John W. Small
# Documentation:: Gavin Sinclair
# Licence:: Freeware.
# Licence:: Ruby License
require "socket"
require "thread"

View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-09-15"
#define RUBY_PATCHLEVEL 317
#define RUBY_RELEASE_DATE "2013-09-27"
#define RUBY_PATCHLEVEL 318
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 9
#define RUBY_RELEASE_DAY 15
#define RUBY_RELEASE_DAY 27
#include "ruby/version.h"