summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-09 14:41:56 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-09 14:41:56 +0000
commitb78c7fa106da832f4fe7d2ad8c1f25410fa6b538 (patch)
treed6069d9d918f0f114cc2e06869d978a5f3295672
parent8c7d4383a7d3c5f360e3803b380610cae17cbc26 (diff)
merge revision(s) 39461:
* thread.c: Document ThreadGroup::Default git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--thread.c6
-rw-r--r--version.h2
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4aaaa1a741..ee9b14ac71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar 9 23:41:11 2013 Zachary Scott <zachary@zacharyscott.net>
+
+ * thread.c: Document ThreadGroup::Default
+
Sat Mar 9 23:31:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_insnhelper.c (vm_call_method): block level control frame does not
diff --git a/thread.c b/thread.c
index b232f395de..899cb70c50 100644
--- a/thread.c
+++ b/thread.c
@@ -3853,6 +3853,12 @@ static const rb_data_type_t thgroup_data_type = {
* were created.
*/
+/*
+ * Document-const: Default
+ *
+ * The default ThreadGroup created when Ruby starts; all Threads belong to it
+ * by default.
+ */
static VALUE
thgroup_s_alloc(VALUE klass)
{
diff --git a/version.h b/version.h
index 66267aa20f..9709ef0795 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-03-09"
-#define RUBY_PATCHLEVEL 42
+#define RUBY_PATCHLEVEL 43
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 3