Mercurial > hg > truffle
diff mx/projects @ 12394:df3af5e007ad
Merge.
| author | Christian Humer <christian.humer@gmail.com> |
|---|---|
| date | Wed, 09 Oct 2013 15:33:36 +0200 |
| parents | f759edd9e809 |
| children | c1910f6400d7 5124eeec1a7b |
line wrap: on
line diff
--- a/mx/projects Thu Oct 03 18:09:21 2013 +0200 +++ b/mx/projects Wed Oct 09 15:33:36 2013 +0200 @@ -186,7 +186,7 @@ # graal.graph project@com.oracle.graal.graph@subDir=graal project@com.oracle.graal.graph@sourceDirs=src -project@com.oracle.graal.graph@dependencies=com.oracle.graal.debug +project@com.oracle.graal.graph@dependencies=com.oracle.graal.debug,com.oracle.graal.api.code project@com.oracle.graal.graph@javaCompliance=1.7 project@com.oracle.graal.graph@workingSets=Graal,Graph @@ -297,7 +297,7 @@ # graal.nodes project@com.oracle.graal.nodes@subDir=graal project@com.oracle.graal.nodes@sourceDirs=src -project@com.oracle.graal.nodes@dependencies=com.oracle.graal.graph,com.oracle.graal.api.replacements,com.oracle.graal.api.code +project@com.oracle.graal.nodes@dependencies=com.oracle.graal.graph,com.oracle.graal.api.replacements project@com.oracle.graal.nodes@checkstyle=com.oracle.graal.graph project@com.oracle.graal.nodes@javaCompliance=1.7 project@com.oracle.graal.nodes@workingSets=Graal,Graph @@ -497,7 +497,7 @@ # graal.hsail project@com.oracle.graal.hsail@subDir=graal project@com.oracle.graal.hsail@sourceDirs=src -project@com.oracle.graal.hsail@dependencies=com.oracle.graal.api.code,com.oracle.graal.graph +project@com.oracle.graal.hsail@dependencies=com.oracle.graal.graph project@com.oracle.graal.hsail@checkstyle=com.oracle.graal.graph project@com.oracle.graal.hsail@javaCompliance=1.7