# HG changeset patch
# User jjg
# Date 1432241303 25200
# Node ID f4b21d02e8868e02d284cec054a0e251183b10df
# Parent  bce32ab8601e4142f7f842e47323311759721111# Parent  38eaf2ca243e4e2f67f96fd443f3a2084d32180a
Merge

diff -r 38eaf2ca243e -r f4b21d02e886 langtools/test/tools/javac/proprietary/WarnClass.out
--- a/langtools/test/tools/javac/proprietary/WarnClass.out	Thu May 21 21:15:28 2015 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnClass.out	Thu May 21 13:48:23 2015 -0700
@@ -1,4 +1,4 @@
-WarnClass.java:12:40: compiler.warn.sun.proprietary: sun.misc.Lock
+WarnClass.java:13:40: compiler.warn.sun.proprietary: sun.misc.Lock
 - compiler.err.warnings.and.werror
 1 error
 1 warning
diff -r 38eaf2ca243e -r f4b21d02e886 langtools/test/tools/javac/proprietary/WarnMethod.out
--- a/langtools/test/tools/javac/proprietary/WarnMethod.out	Thu May 21 21:15:28 2015 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnMethod.out	Thu May 21 13:48:23 2015 -0700
@@ -1,4 +1,4 @@
-WarnMethod.java:14:36: compiler.warn.sun.proprietary: sun.misc.VM
+WarnMethod.java:15:36: compiler.warn.sun.proprietary: sun.misc.VM
 - compiler.err.warnings.and.werror
 1 error
 1 warning
diff -r 38eaf2ca243e -r f4b21d02e886 langtools/test/tools/javac/proprietary/WarnVariable.out
--- a/langtools/test/tools/javac/proprietary/WarnVariable.out	Thu May 21 21:15:28 2015 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnVariable.out	Thu May 21 13:48:23 2015 -0700
@@ -1,4 +1,4 @@
-WarnVariable.java:14:36: compiler.warn.sun.proprietary: sun.misc.FloatConsts
+WarnVariable.java:15:36: compiler.warn.sun.proprietary: sun.misc.FloatConsts
 - compiler.err.warnings.and.werror
 1 error
 1 warning
diff -r 38eaf2ca243e -r f4b21d02e886 langtools/test/tools/javac/proprietary/WarnWildcard.out
--- a/langtools/test/tools/javac/proprietary/WarnWildcard.out	Thu May 21 21:15:28 2015 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnWildcard.out	Thu May 21 13:48:23 2015 -0700
@@ -1,4 +1,4 @@
-WarnWildcard.java:13:44: compiler.warn.sun.proprietary: sun.misc.FloatConsts
+WarnWildcard.java:14:44: compiler.warn.sun.proprietary: sun.misc.FloatConsts
 - compiler.err.warnings.and.werror
 1 error
 1 warning