commit | d2ad9f4bf8c8d3495c51c15ae0597795d717f0d1 | [log] [tgz] |
---|---|---|
author | Marshall Schor <schor@apache.org> | Tue Aug 12 21:05:34 2014 +0000 |
committer | Marshall Schor <schor@apache.org> | Tue Aug 12 21:05:34 2014 +0000 |
tree | e3727b5d3a947f638be5eda85dbb8289c75b60a1 | |
parent | 371eb70e70b71064ef09cd357b9e1ce42812ed8d [diff] |
[UIMA-3969] merge from trunk prior to remerging branch - only a property changed git-svn-id: https://svn.apache.org/repos/asf/uima/uimaj/branches/2.6.0-json@1617589 13f79535-47bb-0310-9956-ffa450edef68