summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-16 02:11:36 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-16 02:11:36 +0000
commite9ff4a22dfbd07ea6c54179979d937ff739eead3 (patch)
tree03b87b343800f7dd25c718942366d1b0cc48b2f0 /version.h
parentae5930a892da55dddc8513dde50b0dc65572ca3a (diff)
merge revision(s) 36800: [Backport #6377]
* file.c (rb_find_file_ext_safe, rb_find_file_safe): default to US-ASCII for encdb and transdb. * load.c (search_required): keep encoding of feature name. set loading path to filesystem encoding. [Bug #6377][ruby-core:44750] * ruby.c (add_modules, require_libraries): assume default external encoding as well as ARGV. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37209 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 58e3b12eb7..db4f2c526f 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 293
+#define RUBY_PATCHLEVEL 294
#define RUBY_RELEASE_DATE "2012-10-16"
#define RUBY_RELEASE_YEAR 2012