comparison mx/projects @ 16700:e0be8b8a9a85

Merge.
author Chris Seaton <chris.seaton@oracle.com>
date Tue, 05 Aug 2014 22:22:43 +0100
parents 4e2178dc81fb
children 56bcde831179
comparison
equal deleted inserted replaced
16699:6de97968e3ef 16700:e0be8b8a9a85
316 project@com.oracle.graal.hotspot.test@dependencies=com.oracle.graal.replacements.test,com.oracle.graal.hotspot 316 project@com.oracle.graal.hotspot.test@dependencies=com.oracle.graal.replacements.test,com.oracle.graal.hotspot
317 project@com.oracle.graal.hotspot.test@checkstyle=com.oracle.graal.graph 317 project@com.oracle.graal.hotspot.test@checkstyle=com.oracle.graal.graph
318 project@com.oracle.graal.hotspot.test@javaCompliance=1.8 318 project@com.oracle.graal.hotspot.test@javaCompliance=1.8
319 project@com.oracle.graal.hotspot.test@workingSets=Graal,HotSpot,Test 319 project@com.oracle.graal.hotspot.test@workingSets=Graal,HotSpot,Test
320 320
321 # graal.hotspot.jdk8.test
322 project@com.oracle.graal.hotspot.jdk8.test@subDir=graal
323 project@com.oracle.graal.hotspot.jdk8.test@sourceDirs=src
324 project@com.oracle.graal.hotspot.jdk8.test@dependencies=com.oracle.graal.compiler.test
325 project@com.oracle.graal.hotspot.jdk8.test@checkstyle=com.oracle.graal.graph
326 project@com.oracle.graal.hotspot.jdk8.test@javaCompliance=1.8
327 project@com.oracle.graal.hotspot.jdk8.test@workingSets=Graal,HotSpot,Test
328
329 # graal.hotspot.amd64.test 321 # graal.hotspot.amd64.test
330 project@com.oracle.graal.hotspot.amd64.test@subDir=graal 322 project@com.oracle.graal.hotspot.amd64.test@subDir=graal
331 project@com.oracle.graal.hotspot.amd64.test@sourceDirs=src 323 project@com.oracle.graal.hotspot.amd64.test@sourceDirs=src
332 project@com.oracle.graal.hotspot.amd64.test@dependencies=com.oracle.graal.asm.amd64,com.oracle.graal.compiler.test 324 project@com.oracle.graal.hotspot.amd64.test@dependencies=com.oracle.graal.asm.amd64,com.oracle.graal.compiler.test
333 project@com.oracle.graal.hotspot.amd64.test@checkstyle=com.oracle.graal.graph 325 project@com.oracle.graal.hotspot.amd64.test@checkstyle=com.oracle.graal.graph