comparison mx/projects @ 13239:bb35fc7e0d68

Merge.
author Doug Simon <doug.simon@oracle.com>
date Tue, 03 Dec 2013 18:40:03 +0100
parents bc1b0ff498f4
children d8692e751c65
comparison
equal deleted inserted replaced
13238:b429ec5c46d6 13239:bb35fc7e0d68
151 project@com.oracle.graal.hotspot.sparc@workingSets=Graal,HotSpot,SPARC 151 project@com.oracle.graal.hotspot.sparc@workingSets=Graal,HotSpot,SPARC
152 152
153 # graal.hotspot.ptx 153 # graal.hotspot.ptx
154 project@com.oracle.graal.hotspot.ptx@subDir=graal 154 project@com.oracle.graal.hotspot.ptx@subDir=graal
155 project@com.oracle.graal.hotspot.ptx@sourceDirs=src 155 project@com.oracle.graal.hotspot.ptx@sourceDirs=src
156 project@com.oracle.graal.hotspot.ptx@dependencies=com.oracle.graal.ptx,com.oracle.graal.compiler.ptx 156 project@com.oracle.graal.hotspot.ptx@dependencies=com.oracle.graal.ptx,com.oracle.graal.compiler.ptx,com.oracle.graal.hotspot
157 project@com.oracle.graal.hotspot.ptx@checkstyle=com.oracle.graal.graph 157 project@com.oracle.graal.hotspot.ptx@checkstyle=com.oracle.graal.graph
158 project@com.oracle.graal.hotspot.ptx@annotationProcessors=com.oracle.graal.service.processor 158 project@com.oracle.graal.hotspot.ptx@annotationProcessors=com.oracle.graal.service.processor
159 project@com.oracle.graal.hotspot.ptx@javaCompliance=1.7 159 project@com.oracle.graal.hotspot.ptx@javaCompliance=1.7
160 project@com.oracle.graal.hotspot.ptx@workingSets=Graal,HotSpot,PTX 160 project@com.oracle.graal.hotspot.ptx@workingSets=Graal,HotSpot,PTX
161 161