Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/core/lombok/eclipse/handlers/HandleBuilder.java
#	src/core/lombok/eclipse/handlers/HandleConstructor.java
#	src/core/lombok/javac/handlers/HandleBuilder.java
#	src/core/lombok/javac/handlers/HandleConstructor.java

1 files changed, 0 insertions, 15 deletions

diff --git a/test/transform/resource/after-delombok/GetterSetterJavadoc.java b/test/transform/resource/after-delombok/GetterSetterJavadoc.java
index 21b339e8..f156de92 100644
--- a/test/transform/resource/after-delombok/GetterSetterJavadoc.java
+++ b/test/transform/resource/after-delombok/GetterSetterJavadoc.java
@@ -5,7 +5,6 @@ class GetterSetterJavadoc1 {
 	private int fieldName;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public GetterSetterJavadoc1() {
 	}
 	/**
@@ -15,7 +14,6 @@ class GetterSetterJavadoc1 {
 	 */
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public int getFieldName() {
 		return this.fieldName;
 	}
@@ -26,14 +24,12 @@ class GetterSetterJavadoc1 {
 	 */
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public void setFieldName(final int fieldName) {
 		this.fieldName = fieldName;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof GetterSetterJavadoc1)) return false;
@@ -44,14 +40,12 @@ class GetterSetterJavadoc1 {
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof GetterSetterJavadoc1;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -61,7 +55,6 @@ class GetterSetterJavadoc1 {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public java.lang.String toString() {
 		return "GetterSetterJavadoc1(fieldName=" + this.getFieldName() + ")";
 	}
@@ -78,7 +71,6 @@ class GetterSetterJavadoc2 {
 	 */
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public int getFieldName() {
 		return this.fieldName;
 	}
@@ -89,7 +81,6 @@ class GetterSetterJavadoc2 {
 	 */
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public void setFieldName(final int fieldName) {
 		this.fieldName = fieldName;
 	}
@@ -105,7 +96,6 @@ class GetterSetterJavadoc3 {
 	 */
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public int getFieldName() {
 		return this.fieldName;
 	}
@@ -115,7 +105,6 @@ class GetterSetterJavadoc3 {
 	 */
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public void setFieldName(final int fieldName) {
 		this.fieldName = fieldName;
 	}
@@ -132,7 +121,6 @@ class GetterSetterJavadoc4 {
 	 */
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public int fieldName() {
 		return this.fieldName;
 	}
@@ -144,7 +132,6 @@ class GetterSetterJavadoc4 {
 	 */
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public GetterSetterJavadoc4 fieldName(final int fieldName) {
 		this.fieldName = fieldName;
 		return this;
@@ -161,7 +148,6 @@ class GetterSetterJavadoc5 {
 	 */
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public int fieldName() {
 		return this.fieldName;
 	}
@@ -172,7 +158,6 @@ class GetterSetterJavadoc5 {
 	 */
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public GetterSetterJavadoc5 fieldName(final int fieldName) {
 		this.fieldName = fieldName;
 		return this;