summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-24 15:40:25 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-24 15:40:25 +0000
commit8a4fa092e26629ce87c2f2c30fd795ba32f06e27 (patch)
treeddf50ff5138279d46d75d6063f92dffed83ca445
parent072ac9a2004ed5dbd1ed86f26cc42ed333e22344 (diff)
merge revision(s) 40435:
Typo by @windwiny [Fixes GH-295] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/tk/sample/demos-en/text.rb2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/tk/sample/demos-en/text.rb b/ext/tk/sample/demos-en/text.rb
index 5794a85e87..2f72de7583 100644
--- a/ext/tk/sample/demos-en/text.rb
+++ b/ext/tk/sample/demos-en/text.rb
@@ -117,7 +117,7 @@ insertion cursor. #{
end
}
-7. Resize the window. This widget has been configured with the "setGrid"
+8. Resize the window. This widget has been configured with the "setGrid"
option on, so that if you resize the window it will always resize to an
even number of characters high and wide. Also, if you make the window
narrow you can see that long lines automatically wrap around onto
diff --git a/version.h b/version.h
index d6717292ed..a36e7308e9 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-04-25"
-#define RUBY_PATCHLEVEL 165
+#define RUBY_PATCHLEVEL 166
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 4