comparison hotspot/.project @ 10409:36bcc10e01c0

merge fixes
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 15:37:32 +0200
parents f6b1694360ec
children 0c651af30cc8
comparison
equal deleted inserted replaced
10408:836a62f43af9 10409:36bcc10e01c0
84 <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature> 84 <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
85 <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> 85 <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
86 </natures> 86 </natures>
87 <linkedResources> 87 <linkedResources>
88 <link> 88 <link>
89 <name>ptx</name>
90 <type>2</type>
91 <locationURI>PARENT-1-PROJECT_LOC/src/gpu/ptx</locationURI>
92 </link>
93 <link>
89 <name>x86</name> 94 <name>x86</name>
90 <type>2</type> 95 <type>2</type>
91 <locationURI>PARENT-1-PROJECT_LOC/src/cpu/x86/vm</locationURI> 96 <locationURI>PARENT-1-PROJECT_LOC/src/cpu/x86/vm</locationURI>
92 </link> 97 </link>
93 <link> 98 <link>