summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-19 17:05:55 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-19 17:05:55 +0000
commita4a49a8d4ccb8d9bc5facb7220c63a7befbee950 (patch)
treee683e8e8f42733f8ab1027c6ae8cd7515208ffca
parent4bcae05f01915183e7bc525c0f2e4682a0ec40e0 (diff)
partially merge revision(s) r44082: [Backport #9228]
* ext/.document: Add syslog/lib to documentable items. [Bug #9228] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/.document1
-rw-r--r--version.h2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 82445a6b89..60130e2406 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb 20 02:04:09 2014 Eric Hodel <drbrain@segment7.net>
+
+ * ext/.document: Add syslog/lib to documentable items. [Bug #9228]
+
Thu Feb 20 01:54:08 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_insnhelper.c (vm_search_super_method): when super called in a
diff --git a/ext/.document b/ext/.document
index 6997dbe356..6f40c875ad 100644
--- a/ext/.document
+++ b/ext/.document
@@ -96,6 +96,7 @@ socket
stringio/stringio.c
strscan/strscan.c
syslog/syslog.c
+syslog/lib
win32ole/lib
win32ole/win32ole.c
zlib/zlib.c
diff --git a/version.h b/version.h
index df4802f2c7..03b6791228 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-02-20"
-#define RUBY_PATCHLEVEL 440
+#define RUBY_PATCHLEVEL 441
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 2