summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-12 04:45:31 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-12 04:45:31 +0000
commitaa9e93f93e37d8d03e827058d78aae723f48e349 (patch)
treefcc4a1ef0103119b6c21cd57b2447bf77d2738b7
parentf3fa74cb9b2b2118e00965339503426b4d06f168 (diff)
* win32/Makefile.sub: fixes a mistake in merging r22822.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--version.h2
-rw-r--r--win32/Makefile.sub1
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c7ab1c2c08..0df7e34b85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 12 13:43:35 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * win32/Makefile.sub: fixes a mistake in merging r22822.
+
Sun Mar 8 23:02:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/Makefile.sub (LDFLAGS): always prepends -link.
diff --git a/version.h b/version.h
index 02cb265c3a..90b685665d 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-05-12"
-#define RUBY_PATCHLEVEL 127
+#define RUBY_PATCHLEVEL 128
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 6cd1b28e06..1d25ddaa93 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -166,7 +166,6 @@ CXXFLAGS = $(CFLAGS)
!if !defined(LDFLAGS)
LDFLAGS = -incremental:no -debug -opt:ref -opt:icf
!endif
-LDFLAGS = -link $(LDFLAGS)
!if !defined(XLDFLAGS)
XLDFLAGS = -stack:$(STACK)
!endif