Merge branch 'groovy7955'
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/7775ea47 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/7775ea47 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/7775ea47 Branch: refs/heads/parrot Commit: 7775ea472e467c5565a99ceb0c48ae044096c5ae Parents: 11270ed 5e74067 Author: paulk <pa...@asert.com.au> Authored: Wed Oct 5 07:13:45 2016 +1000 Committer: paulk <pa...@asert.com.au> Committed: Wed Oct 5 07:13:45 2016 +1000 ---------------------------------------------------------------------- src/main/org/codehaus/groovy/antlr/java/java.g | 8 +++++- .../tools/groovydoc/GroovyDocToolTest.java | 16 ++++++++++-- .../testfiles/JavaClassWithDiamond.java | 26 ++++++++++++++++++++ 3 files changed, 47 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
