summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog22
-rw-r--r--version.h3
2 files changed, 12 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e1cc77216..6400e89691 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,23 +1,23 @@
-Thu Dec 25 17:30:40 2014 Naohisa Goto <ngotogenome@gmail.com>
+Thu Dec 25 17:42:01 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/io/console/console.c (console_dev): send the given arguments
+ to the opened console. as a special case, do nothing if :close
+ is given.
+
+ * test/lib/leakchecker.rb (LeakChecker#check_fd_leak): close if
+ console.
+
+Thu Dec 25 17:37:47 2014 Naohisa Goto <ngotogenome@gmail.com>
* gc.c (wmap_final_func): fix memory size shortage when realloc wmap.
Fix SEGV during finilize of WeakRef on Solaris (though the SEGV
could occur on all OS/platforms). [ruby-dev:48779] [Bug #10646]
-Thu Dec 25 17:27:06 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Dec 25 17:31:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (NET_LUID): include winsock2.h instead of windows.h.
patch by Jon Forums in [ruby-core:67125]. [Bug #10640]
-Thu Dec 25 16:14:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/io/console/console.c (console_dev): send the given arguments
- to the opened console. as a special case, do nothing if :close
- is given.
-
- * test/lib/leakchecker.rb (LeakChecker#check_fd_leak): close if
- console.
-
Thu Dec 25 16:01:19 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_expand_path_internal): drop characters ignored
diff --git a/version.h b/version.h
index e68cb3f0ca..eacc75f589 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,6 @@
#define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2014-12-25"
-#define RUBY_PATCHLEVEL -1
-#define RUBY_BRANCH_NAME "trunk"
+#define RUBY_PATCHLEVEL 0
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 12