summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-04 08:56:20 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-04 08:56:20 +0000
commit798a26e1f9e8485241a70a6ee9658b2877d3673c (patch)
treebd7903b906d438b6afc50047f4768b4ba6681ed6
parent21038f53153cbee041b8606016b74bc8f42ed323 (diff)
merges r20492 from trunk into ruby_1_9_1.
* lib/gserver.rb: fixed type in sample code. a report from Oleg Puchinin. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/gserver.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 51ea853de..6f31deafa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 4 16:16:09 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/gserver.rb: fixed type in sample code. a report from Oleg
+ Puchinin.
+
Thu Dec 4 14:54:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/rubygems/local_remote_options.rb (Gem#add_update_sources_option):
diff --git a/lib/gserver.rb b/lib/gserver.rb
index eb5f31b7b..592e8661f 100644
--- a/lib/gserver.rb
+++ b/lib/gserver.rb
@@ -40,7 +40,7 @@ require "thread"
# super(port, *args)
# end
# def serve(io)
-# io.puts(Time.now.to_i)
+# io.puts(Time.now.to_s)
# end
# end
#