summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--version.h2
-rw-r--r--win32/Makefile.sub2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d609a00247..638994812b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 24 02:21:41 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (VCSUP): nothing to do if this worktree is not
+ under any VCS (it means that the worktree may be from the release
+ package).
+
Wed Sep 24 02:06:33 2014 Tanaka Akira <akr@fsij.org>
* test/ruby/test_time_tz.rb: Fix test error with tzdata-2014g.
diff --git a/version.h b/version.h
index ebd55759bb..7f6a16230d 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.4"
#define RUBY_RELEASE_DATE "2014-09-24"
-#define RUBY_PATCHLEVEL 245
+#define RUBY_PATCHLEVEL 246
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 9
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index d6289bc53d..e393b46253 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -377,6 +377,8 @@ VCSUP = $(VCS) rebase $(GITSVNREBASEOPTIONS)
!else if exist($(srcdir)/.git)
VCS = git
VCSUP = $(VCS) pull $(GITPULLOPTIONS)
+!else
+VCSUP = rem
!endif
ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc