Mercurial > hg > truffle

diff hotspot/.project @ 12565:e47f373499ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Christian Humer <christian.humer@gmail.com>
date Mon, 21 Oct 2013 11:07:47 +0200
parents 0c651af30cc8
children f1a55428a8d7
line wrap: on
line diff
--- a/hotspot/.project	Mon Oct 21 11:07:32 2013 +0200
+++ b/hotspot/.project	Mon Oct 21 11:07:47 2013 +0200
@@ -96,6 +96,11 @@
 			<locationURI>PARENT-1-PROJECT_LOC/src/cpu/x86/vm</locationURI>
 		</link>
 		<link>
+			<name>ptx</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/gpu/ptx/vm</locationURI>
+		</link>
+		<link>
 			<name>sparc</name>
 			<type>2</type>
 			<locationURI>PARENT-1-PROJECT_LOC/src/cpu/sparc/vm</locationURI>
@@ -121,6 +126,11 @@
 			<locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/bsd_x86/vm</locationURI>
 		</link>
 		<link>
+			<name>bsd_ptx</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/os_gpu/bsd_ptx/vm</locationURI>
+		</link>
+		<link>
 			<name>windows</name>
 			<type>2</type>
 			<locationURI>PARENT-1-PROJECT_LOC/src/os/windows/vm</locationURI>
@@ -141,6 +151,11 @@
 			<locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_x86/vm</locationURI>
 		</link>
 		<link>
+			<name>linux_ptx</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src/os_gpu/linux_ptx/vm</locationURI>
+		</link>
+		<link>
 			<name>linux_sparc</name>
 			<type>2</type>
 			<locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_sparc/vm</locationURI>