diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-28 14:15:16 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-28 14:15:16 +0000 |
| commit | 3b6e807a017588117ede7bb1fa883fe504e89ca6 (patch) | |
| tree | 3c4a14c523f64209692e49719deaa839a265366c /version.h | |
| parent | 60a8777de7d5cf8f52272748df2e8af6a16383aa (diff) | |
merges r24574 from trunk into ruby_1_9_1.
--
* vm_insnhelper.c (vm_call_cfunc): ensure hook c-return.
[Bug #1588]
* test/ruby/test_settracefunc.rb (TestSetTraceFunc#test_raise):
follow above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
| -rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 295 +#define RUBY_PATCHLEVEL 296 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |