Mercurial > hg > truffle
diff 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 |
line wrap: on
line diff
--- a/mx/projects Tue Dec 03 18:19:56 2013 +0100 +++ b/mx/projects Tue Dec 03 18:40:03 2013 +0100 @@ -153,7 +153,7 @@ # graal.hotspot.ptx project@com.oracle.graal.hotspot.ptx@subDir=graal project@com.oracle.graal.hotspot.ptx@sourceDirs=src -project@com.oracle.graal.hotspot.ptx@dependencies=com.oracle.graal.ptx,com.oracle.graal.compiler.ptx +project@com.oracle.graal.hotspot.ptx@dependencies=com.oracle.graal.ptx,com.oracle.graal.compiler.ptx,com.oracle.graal.hotspot project@com.oracle.graal.hotspot.ptx@checkstyle=com.oracle.graal.graph project@com.oracle.graal.hotspot.ptx@annotationProcessors=com.oracle.graal.service.processor project@com.oracle.graal.hotspot.ptx@javaCompliance=1.7