summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 18:28:35 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 18:28:35 +0000
commit9a820db0f1a76fee97b3cff575339045d42ecdf2 (patch)
treeaa6a8e1cfacb468d8e3efaaa72d173403cc7c598 /version.h
parent0c7a99724f444ce83492d522c36f3f94d617acb3 (diff)
merge revision(s) 13830:
* lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for nkf conversion. a patch from <moonwolf AT moonwolf.com>. [ruby-dev:32183] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16925 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 d55e8078c0..8ae38f531e 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-08"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 141
+#define RUBY_PATCHLEVEL 142
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8