From: Andy Clement <aclement@gopivotal.com>
Date: Mon, 21 Apr 2014 22:13:19 +0000 (-0700)
Subject: Merge branch 'BETA_JAVA8'
X-Git-Tag: V1_8_1~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=144a6294884029d2a5a2a67d0e792b8507a7e897;p=aspectj.git

Merge branch 'BETA_JAVA8'

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
---

144a6294884029d2a5a2a67d0e792b8507a7e897