summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-11 02:28:53 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-11 02:28:53 +0000
commitdbab45654393ad38e9fcb6210308e5b044f15bd5 (patch)
tree5576e8cb64d9687850a5a07d53664d8e4b7064a0 /version.h
parentd8cf72f4189e701172878836becef3f047a57dc5 (diff)
merge revision(s) 39299,39300: [Backport #7477]
* lib/ipaddr.rb (IPAddr#in6_addr): Fix the parser so that it can recognize IPv6 addresses with only one edge 16-bit piece compressed, like [::2:3:4:5:6:7:8] or [1:2:3:4:5:6:7::]. [Bug #7477] * lib/ipaddr.rb (IPAddr#in6_addr): Fix a typo with the closing parenthesis. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40230 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.h b/version.h
index b989fdece9..42b30cc0e2 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 414
+#define RUBY_PATCHLEVEL 415
#define RUBY_RELEASE_DATE "2013-04-11"
#define RUBY_RELEASE_YEAR 2013