Merge
authorddehaven
Tue, 17 Feb 2015 11:50:02 -0800
changeset 29170 96d9a55357fd
parent 29169 9a91cf20c223 (diff)
parent 28909 58d622f06630 (current diff)
child 29171 6b6e22f836d0
Merge
hotspot/test/serviceability/dcmd/ClassLoaderStatsTest.java
hotspot/test/serviceability/dcmd/DcmdUtil.java
hotspot/test/serviceability/dcmd/DynLibDcmdTest.java
jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Aspect.java
--- a/make/CompileJavaModules.gmk	Tue Feb 17 11:44:44 2015 -0800
+++ b/make/CompileJavaModules.gmk	Tue Feb 17 11:50:02 2015 -0800
@@ -94,7 +94,7 @@
 ################################################################################
 
 java.desktop_COPY := .gif .png .wav .txt .xml .css .pf
-java.desktop_CLEAN := iio-plugin.properties
+java.desktop_CLEAN := iio-plugin.properties cursors.properties
 
 java.desktop_EXCLUDES += \
     java/awt/doc-files \