summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-20 02:28:05 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-20 02:28:05 +0000
commit1e75c183459f33ecda3227ab21b4242b74501e05 (patch)
treec920a6594b820fa536f88e6a562d64fc0475a3d6
parent4949acb2a1416fbc847961bc3b90ffd1705c7565 (diff)
merge revision(s) 49340:
Use master instead of HEAD git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49341 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--tool/downloader.rb2
-rw-r--r--version.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/tool/downloader.rb b/tool/downloader.rb
index e1071fcd16..dd3173bae7 100644
--- a/tool/downloader.rb
+++ b/tool/downloader.rb
@@ -3,7 +3,7 @@ require 'open-uri'
class Downloader
class GNU < self
def self.download(name, *rest)
- super("http://gcc.gnu.org/git/?p=gcc.git;a=blob_plain;f=#{name};hb=HEAD", name, *rest)
+ super("http://gcc.gnu.org/git/?p=gcc.git;a=blob_plain;f=#{name};hb=master", name, *rest)
end
end
diff --git a/version.h b/version.h
index a0799bbdd7..6e578eadcc 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.0"
-#define RUBY_RELEASE_DATE "2015-01-19"
-#define RUBY_PATCHLEVEL 32
+#define RUBY_RELEASE_DATE "2015-01-20"
+#define RUBY_PATCHLEVEL 33
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 20
#include "ruby/version.h"