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 eb6c985a5d..5008c79dc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Oct 15 15:57:48 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 Oct 15 15:35:39 2014 Kazuki Tsujimoto <kazuki@callcc.net>
* ext/pathname/pathname.c (path_inspect): use PRIsVALUE to preserve
diff --git a/version.h b/version.h
index ced2a74cc9..bb1418ae03 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-10-15"
-#define RUBY_PATCHLEVEL 578
+#define RUBY_PATCHLEVEL 579
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 10
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 5c5a241102..38218cdbe9 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -371,6 +371,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