summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--version.h2
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f8f303e59c..312c825b76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Tue Dec 27 18:28:20 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dln.c (dln_load): raise LoadError instead of fatal error on
+ recent OSX, dlclose seems fixed in El Capitan or later.
+ [ruby-core:78200] [Bug #12956]
+
+Tue Dec 27 18:17:23 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/misc/test_ruby_mode.rb (assert_indent): since write-region
+ in Emacs 25.1 no longer displays the "Wrote file" message, shows
+ the explicit message to check if successfully finished.
+ [ruby-core:77355] [Bug #12785]
+
Tue Nov 15 15:29:36 2016 NARUSE, Yui <naruse@ruby-lang.org>
* ext/openssl/ossl_ssl.c (ssl_npn_select_cb_common): fix parsing
diff --git a/version.h b/version.h
index adf27c6210..b3a9196023 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.7"
#define RUBY_RELEASE_DATE "2016-12-27"
-#define RUBY_PATCHLEVEL 399
+#define RUBY_PATCHLEVEL 400
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 12