From a9649469b5de1ae185bde4c5dbece6f16e89c85d Mon Sep 17 00:00:00 2001
From: tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 7 Apr 2012 21:31:43 +0000
Subject: 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
---
 version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'version.h')

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
-- 
cgit v1.2.3