Skip to content

Commit 8b2c390

Browse files
committed
merge revision(s) 41590,41591:
* win32/README.win32: grammar typo by @blankenshipz [Fix rubyGH-334] ruby#334 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 4219cf6 commit 8b2c390

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Tue Jun 25 00:10:54 2013 Zachary Scott <[email protected]>
2+
3+
* win32/README.win32: grammar typo by @blankenshipz [Fix GH-334]
4+
https://github.com/ruby/ruby/pull/334
5+
16
Sun Jun 23 00:09:12 2013 Masaya Tarui <[email protected]>
27

38
* gc.c: Fixup around GC by MALLOC.

version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#define RUBY_VERSION "2.0.0"
2-
#define RUBY_RELEASE_DATE "2013-06-23"
3-
#define RUBY_PATCHLEVEL 238
2+
#define RUBY_RELEASE_DATE "2013-06-25"
3+
#define RUBY_PATCHLEVEL 239
44

55
#define RUBY_RELEASE_YEAR 2013
66
#define RUBY_RELEASE_MONTH 6
7-
#define RUBY_RELEASE_DAY 23
7+
#define RUBY_RELEASE_DAY 25
88

99
#include "ruby/version.h"
1010

win32/README.win32

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
The default ((|<PLATFORM>|)) is `(({i386-mswin32}))'.
4141

4242
(2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
43-
if you want to change the name of the executable files.
43+
if you want to change the name of the executable files.
4444
And add ((|RUBYW_INSTALL_NAME|)) to change the name of the
4545
executable without console window if also you want.
4646

@@ -60,8 +60,8 @@ to their base names.
6060
$(RUBYW_INSTALL_NAME).ico or rubyw.ico --> $(RUBYW_INSTALL_NAME).exe
6161
the others --> $(RUBY_SO_NAME).dll
6262

63-
Although no icons are distributed with the ruby source or in the official
64-
site, you can use anything you like. For example, followings are written
63+
Although no icons are distributed with the ruby source or in the official
64+
site, you can use anything you like. For example, followings are written
6565
in Japanese, but you can download at least.
6666

6767
* ((<URL:http://homepage1.nifty.com/a_nakata/ruby/>)) or
@@ -129,7 +129,7 @@ in Japanese, but you can download at least.
129129

130130
== Bugs
131131

132-
You can ((*NOT*)) use a path name contains any white space characters as
132+
You can ((*NOT*)) use a path name that contains any white space characters as
133133
the ruby source directory, this restriction comes from the behavior of
134134
(({!INCLUDE})) directives of (({NMAKE})).
135135
((- you may call it a bug. -))

0 commit comments

Comments
 (0)