diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-26 07:05:22 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-26 07:05:22 +0000 |
| commit | 59093eb37a5ba425ab09fe4635d99a3daffeff46 (patch) | |
| tree | a19a451df30cd97b5d081d7eb011535dedb9645d /ChangeLog | |
| parent | 603b000dd034c0ce52e2f8afd0e43c4969e609a4 (diff) | |
fix commit miss [ci skip]
* ChangeLog: remove duplicated entry, caused by a conflict.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -3,11 +3,6 @@ Mon Oct 26 12:55:06 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (call_op2): separate from call_op and also allow "::", while dot_or_colon should not allow ".?". [Feature #11537] -Mon Oct 26 12:54:26 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (call_op2): separate from call_op and also allow "::", - while dot_or_colon should not allow ".?". [Feature #11537] - Mon Oct 26 01:03:23 2015 Rei Odaira <Rei.Odaira@gmail.com> * thread_pthread.c: fix compile erros when |