summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-21 10:16:14 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-21 10:16:14 +0000
commit2b2ccf4235296dde3fdbbe0e2519d1e6ea4ef3ea (patch)
treef93a99b6489a6a0f0a9725aacc9ae690c24d9f5f
parenta6241676eab4e02d31849229c8a5aae3931de067 (diff)
merge revision(s) 36820: [Backport #7550]
mkmf.rb: clean timestamps * lib/mkmf.rb (MakeMakefile::CLEANINGS): clean timestamp files. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/mkmf.rb4
-rw-r--r--version.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index f4f84a6d71..8054e5eeb4 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -2299,8 +2299,8 @@ CLEANINGS = "
clean-rb-default::
clean-rb::
clean-so::
-clean: clean-so clean-rb-default clean-rb
-\t\t@-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep})
+clean: clean-so clean-static clean-rb-default clean-rb
+\t\t-$(Q)$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep}) .*.time
distclean-rb-default::
distclean-rb::
diff --git a/version.h b/version.h
index bebdd72c16..0acc82a23a 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 356
+#define RUBY_PATCHLEVEL 357
#define RUBY_RELEASE_DATE "2012-12-21"
#define RUBY_RELEASE_YEAR 2012