summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-07 21:31:43 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-07 21:31:43 +0000
commita9649469b5de1ae185bde4c5dbece6f16e89c85d (patch)
treefb5b830b4f66880b610fd0bcf547f49df4cc5b9b /version.h
parent79086bb454f604cc993f57b270333d409eb8d900 (diff)
merge revision(s) 35245,35248:
* ext/psych/lib/psych.rb: bumping up psych version to match release. * ext/psych/psych.gemspec: ditto * ext/psych/parser.c: fall back to any encoding if the external encoding is wrong. [ruby-core:44163] * test/psych/test_encoding.rb: fix test git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35251 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 2c79e24091..b3cead555d 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 176
+#define RUBY_PATCHLEVEL 177
#define RUBY_RELEASE_DATE "2012-04-04"
#define RUBY_RELEASE_YEAR 2012