]> source.dussan.org Git - aspectj.git/commitdiff
projects / aspectj.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9da693 5a5bef1)
Merge branch 'BETA_JAVA8'
authorAndy Clement <aclement@gopivotal.com>
Mon, 21 Apr 2014 22:13:19 +0000 (15:13 -0700)
committerAndy Clement <aclement@gopivotal.com>
Mon, 21 Apr 2014 22:13:19 +0000 (15:13 -0700)
Conflicts:
build/usedForMavenUpload/aspectjrt.pom
build/usedForMavenUpload/aspectjtools.pom
build/usedForMavenUpload/aspectjweaver.pom
docs/dist/doc/README-174.html
docs/dist/doc/index.html
lib/asm/build.xml
org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
weaver/.classpath
weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java


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