Mercurial > hg > truffle
comparison hotspot/.project @ 4272:75c951399c65
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 11 Jan 2012 18:25:56 +0100 |
parents | e53926b0a6cb |
children | 597bc897257d |
comparison
equal
deleted
inserted
replaced
4271:311d193de5a2 | 4272:75c951399c65 |
---|---|
91 <locationURI>PARENT-1-PROJECT_LOC/src/cpu/x86</locationURI> | 91 <locationURI>PARENT-1-PROJECT_LOC/src/cpu/x86</locationURI> |
92 </link> | 92 </link> |
93 <link> | 93 <link> |
94 <name>generated</name> | 94 <name>generated</name> |
95 <type>2</type> | 95 <type>2</type> |
96 <locationURI>PARENT-1-PROJECT_LOC/build/linux/linux_amd64_compiler1/generated</locationURI> | 96 <locationURI>PARENT-1-PROJECT_LOC/build/linux/linux_amd64_graal/generated</locationURI> |
97 </link> | 97 </link> |
98 <link> | 98 <link> |
99 <name>os</name> | 99 <name>os</name> |
100 <type>2</type> | 100 <type>2</type> |
101 <locationURI>PARENT-1-PROJECT_LOC/src/os/linux</locationURI> | 101 <locationURI>PARENT-1-PROJECT_LOC/src/os/linux</locationURI> |