]> source.dussan.org Git - aspectj.git/commit
Merge branch 'master' into earlyJava9
authorAndy Clement <aclement@pivotal.io>
Fri, 17 Nov 2017 17:18:23 +0000 (09:18 -0800)
committerAndy Clement <aclement@pivotal.io>
Fri, 17 Nov 2017 17:18:23 +0000 (09:18 -0800)
commit37814d4d64f187c60ee7996af4a0186c2303bf80
treeb1a1bdad98353b6d1fbc44e69de6aaa55b63c11e
parent51bdd256c1ac67c5135e5f5c1208a532aefbd8d8
parentb1ce395b9b55c74f9a6db9787ed9b382d022d710
Merge branch 'master' into earlyJava9

Switching master to the earlyJava9 branch. This merge
with strategy=ours should give us a common root so that
anyone working from master will be able to absorb the change
easily.