summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-10 16:08:30 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-10 16:08:30 +0000
commit8fcdc4e23bf48ee90b7478747bb7a621032eb89e (patch)
tree084cf7d636824864f7f8abd97d29b39c6e1cb3d7 /ChangeLog
parent23f12a0660705d99952267b1e2ad53531771b6b2 (diff)
merge revision(s) 51350: [Backport #11380] [Backport #11389]
* parse.y (lambda_body): pop cmdarg stack for lookahead token. [ruby-core:70067] [Bug #11380] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ca713faa6..8ff71d674e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 11 00:42:53 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (lambda_body): pop cmdarg stack for lookahead
+ token. [ruby-core:70067] [Bug #11380]
+
Tue Aug 11 00:21:56 2015 NARUSE, Yui <naruse@ruby-lang.org>
* ext/socket/extconf.rb: Solaris 11 has struct tcp_info.tcpi_ca_state,