]> source.dussan.org Git - aspectj.git/commitdiff
projects / aspectj.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51bdd25 b1ce395)
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)
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.


Trivial merge
A seamless aspect-oriented extension to the Java programming language: https://github.com/eclipse-aspectj/aspectj