summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-21 07:24:50 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-21 07:24:50 +0000
commit72aa68b0d429a8a04f4f2dae5ba94c32f4ae4de1 (patch)
tree5d28673b1ac20003cb0a1c587415752458e1551b
parentd5ba54a5e0a065f6f03ca2e3801bccda3a849fd3 (diff)
merge revision(s) 35738:
* ext/syslog/syslog.c (mSyslog_inspect): Use rb_sprintf(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--version.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e4b9e8ed6..2164159e77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Mon May 21 16:24:00 2012 Akinori MUSHA <knu@iDaemons.org>
+Mon May 21 16:24:40 2012 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/syslog/syslog.c (mSyslog_inspect): Use rb_sprintf().
* ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a
module before calling rb_class2name().
diff --git a/version.h b/version.h
index 3d41af589e..9caeeccf3e 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 224
+#define RUBY_PATCHLEVEL 225
#define RUBY_RELEASE_DATE "2012-05-21"
#define RUBY_RELEASE_YEAR 2012