diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2013-10-09 20:36:06 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2013-10-09 20:36:06 +0000 |
| commit | f78b1b9ba06ffbbdecee2801917443f79011f134 (patch) | |
| tree | fc3ef7699ec2d5dff96245bc6d90117d597fb678 /java/openjdk6/files/icedtea/security/20130618/langtools_merge-02.patch | |
| parent | Bump PORTREVISION after plist change (diff) | |
Update to Build b28.
Diffstat (limited to 'java/openjdk6/files/icedtea/security/20130618/langtools_merge-02.patch')
| -rw-r--r-- | java/openjdk6/files/icedtea/security/20130618/langtools_merge-02.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/java/openjdk6/files/icedtea/security/20130618/langtools_merge-02.patch b/java/openjdk6/files/icedtea/security/20130618/langtools_merge-02.patch deleted file mode 100644 index e30ce6e420cf..000000000000 --- a/java/openjdk6/files/icedtea/security/20130618/langtools_merge-02.patch +++ /dev/null @@ -1,30 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1371735102 18000 -# Node ID 335cdc9887c56f560991275fe8d32e6edb6b3f1e -# Parent 9aefba5680d55a2e3f718c03cd27cf027c7fc1f9 -Fix more merge issues - -diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java ---- langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java -+++ langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java -@@ -102,6 +102,8 @@ - builder.methods, - configuration.getMemberComparator()); - } -+ return builder; -+ } - - /** - * {@inheritDoc} -diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java ---- langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java -+++ langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java -@@ -179,6 +179,7 @@ - configuration.getText("doclet.Interface_Summary"), - interfaceTableSummary, interfaceTableHeader, summaryContentTree); - } -+ } - - /** - * Build the summary for the classes in this package. |