comparison 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
comparison
equal deleted inserted replaced
19814:4bc9b6838303 19815:7ee442766685
119 <name>linux_sparc</name> 119 <name>linux_sparc</name>
120 <type>2</type> 120 <type>2</type>
121 <locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_sparc/vm</locationURI> 121 <locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_sparc/vm</locationURI>
122 </link> 122 </link>
123 <link> 123 <link>
124 <name>solaris_sparc</name>
125 <type>2</type>
126 <locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/solaris_sparc/vm</locationURI>
127 </link>
128 <link>
129 <name>solaris</name>
130 <type>2</type>
131 <locationURI>PARENT-1-PROJECT_LOC/src/os/solaris/vm</locationURI>
132 </link>
133 <link>
124 <name>linux_x86</name> 134 <name>linux_x86</name>
125 <type>2</type> 135 <type>2</type>
126 <locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_x86/vm</locationURI> 136 <locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_x86/vm</locationURI>
127 </link> 137 </link>
128 <link> 138 <link>