diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-13 15:18:40 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-13 15:18:40 +0000 |
commit | 896af106070c9da72f45bf16b47c6641a6fdbc62 (patch) | |
tree | b41c4eb768ebdc3595ea029a74feb1e0d9ff7dba | |
parent | 0b92f561419a3dc0c6d369bfd640fae398902073 (diff) |
merge revision(s) 41915:
* sprintf.c: Fix typo patch by @hynkle [Fixes GH-357]
https://github.com/ruby/ruby/pull/357
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sprintf.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Jul 14 00:18:08 2013 Zachary Scott <e@zzak.io> + + * sprintf.c: Fix typo patch by @hynkle [Fixes GH-357] + https://github.com/ruby/ruby/pull/357 + Sun Jul 14 00:17:07 2013 Zachary Scott <zachary@zacharyscott.net> * man/ri.1: Incorrect use of .Dd macro [Bug #8620] by Tristan Hill @@ -422,7 +422,7 @@ get_hash(volatile VALUE *hash, int argc, const VALUE *argv) * For more complex formatting, Ruby supports a reference by name. * %<name>s style uses format style, but %{name} style doesn't. * - * Exapmles: + * Examples: * sprintf("%<foo>d : %<bar>f", { :foo => 1, :bar => 2 }) * #=> 1 : 2.000000 * sprintf("%{foo}f", { :foo => 1 }) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-07-14" -#define RUBY_PATCHLEVEL 269 +#define RUBY_PATCHLEVEL 270 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 7 |