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