diff hotspot/.project @ 19815:7ee442766685

Merge.
author Doug Simon <doug.simon@oracle.com>
date Thu, 12 Mar 2015 16:45:24 +0100
parents 3a5847e64b30
children 0d6563e4d1f5
line wrap: on
line diff
--- a/hotspot/.project	Thu Mar 12 16:07:34 2015 +0100
+++ b/hotspot/.project	Thu Mar 12 16:45:24 2015 +0100
@@ -121,6 +121,16 @@
 			<locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_sparc/vm</locationURI>
 		</link>
 		<link>
+			<name>solaris_sparc</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/solaris_sparc/vm</locationURI>
+		</link>
+		<link>
+			<name>solaris</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/os/solaris/vm</locationURI>
+		</link>
+		<link>
 			<name>linux_x86</name>
 			<type>2</type>
 			<locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_x86/vm</locationURI>