comparison mx/projects @ 7268:fac81ae4f513

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 18 Dec 2012 15:50:53 +0100
parents a4b84ba6dc2e 6ed187f3134b
children 390448a6b535
comparison
equal deleted inserted replaced
7267:a4b84ba6dc2e 7268:fac81ae4f513
88 project@com.oracle.graal.hotspot.server@sourceDirs=src 88 project@com.oracle.graal.hotspot.server@sourceDirs=src
89 project@com.oracle.graal.hotspot.server@dependencies=com.oracle.graal.hotspot 89 project@com.oracle.graal.hotspot.server@dependencies=com.oracle.graal.hotspot
90 project@com.oracle.graal.hotspot.server@checkstyle=com.oracle.graal.graph 90 project@com.oracle.graal.hotspot.server@checkstyle=com.oracle.graal.graph
91 project@com.oracle.graal.hotspot.server@javaCompliance=1.7 91 project@com.oracle.graal.hotspot.server@javaCompliance=1.7
92 92
93 # graal.hotspot.test
94 project@com.oracle.graal.hotspot.test@subDir=graal
95 project@com.oracle.graal.hotspot.test@sourceDirs=src
96 project@com.oracle.graal.hotspot.test@dependencies=com.oracle.graal.hotspot,com.oracle.graal.compiler.test
97 project@com.oracle.graal.hotspot.test@checkstyle=com.oracle.graal.graph
98 project@com.oracle.graal.hotspot.test@javaCompliance=1.7
99
93 # graal.graph 100 # graal.graph
94 project@com.oracle.graal.graph@subDir=graal 101 project@com.oracle.graal.graph@subDir=graal
95 project@com.oracle.graal.graph@sourceDirs=src 102 project@com.oracle.graal.graph@sourceDirs=src
96 project@com.oracle.graal.graph@dependencies= 103 project@com.oracle.graal.graph@dependencies=
97 project@com.oracle.graal.graph@javaCompliance=1.7 104 project@com.oracle.graal.graph@javaCompliance=1.7