summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-12 17:03:32 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-12 17:03:32 +0000
commit00a1a0e4a56d995563220043f8ace74318748680 (patch)
treef05767c1709bf703d29f6e073ae1d5b9c1373043
parent71208c0284c3162185a8fd141d67e8ead855f3da (diff)
merge revision(s) 40250:
fix typo git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--doc/standard_library.rdoc2
-rw-r--r--version.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc
index 9000060ca0..8fcc72da07 100644
--- a/doc/standard_library.rdoc
+++ b/doc/standard_library.rdoc
@@ -54,7 +54,7 @@ profile.rb:: Runs the Ruby Profiler__
Profiler__:: Provides a way to profile your Ruby application
PStore:: Implements a file based persistence mechanism based on a Hash
Queue:: Synchronized communication between threads, provided by thread.rb
-Racc:: A LALR(1) parser generator writting in Ruby.
+Racc:: A LALR(1) parser generator written in Ruby.
Rake:: Ruby build program with capabilities similar to make
rational.rb:: Deprecated library replaced by C implementation in core
RbConfig:: Information of your configure and build of Ruby
diff --git a/version.h b/version.h
index 444a268b51..13d03f0d8b 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-04-12"
-#define RUBY_PATCHLEVEL 119
+#define RUBY_RELEASE_DATE "2013-04-13"
+#define RUBY_PATCHLEVEL 120
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 13
#include "ruby/version.h"