Merge
authorchegar
Thu, 27 Jun 2013 10:37:08 +0100
changeset 20810 b464ed57d001
parent 20809 b5e0612d60b9 (current diff)
parent 18561 3286e2e1da31 (diff)
child 20811 6b25b85f10fd
Merge
--- a/jdk/make/java/java/FILES_java.gmk	Thu Jun 20 08:51:47 2013 +0200
+++ b/jdk/make/java/java/FILES_java.gmk	Thu Jun 27 10:37:08 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -529,7 +529,6 @@
     sun/misc/JavaNioAccess.java \
     sun/misc/Perf.java \
     sun/misc/PerfCounter.java \
-    sun/misc/Hashing.java \
     sun/net/www/protocol/jar/Handler.java \
     sun/net/www/protocol/jar/JarURLConnection.java \
     sun/net/www/protocol/file/Handler.java \