Mercurial > hg > truffle
diff mx/projects @ 15214:bf37ce7df3fd
Merge.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Thu, 17 Apr 2014 21:50:14 +0200 |
| parents | 97eed257999b |
| children | d90e5c22ba55 12f2b3baa163 |
line wrap: on
line diff
--- a/mx/projects Thu Apr 17 17:40:39 2014 +0200 +++ b/mx/projects Thu Apr 17 21:50:14 2014 +0200 @@ -253,7 +253,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,com.oracle.graal.api.code,com.oracle.graal.compiler.common,FINDBUGS +project@com.oracle.graal.graph@dependencies=com.oracle.graal.debug,com.oracle.graal.compiler.common,FINDBUGS project@com.oracle.graal.graph@javaCompliance=1.8 project@com.oracle.graal.graph@workingSets=Graal,Graph @@ -502,7 +502,7 @@ # graal.compiler.common project@com.oracle.graal.compiler.common@subDir=graal project@com.oracle.graal.compiler.common@sourceDirs=src -project@com.oracle.graal.compiler.common@dependencies= +project@com.oracle.graal.compiler.common@dependencies=com.oracle.graal.api.code project@com.oracle.graal.compiler.common@checkstyle=com.oracle.graal.graph project@com.oracle.graal.compiler.common@javaCompliance=1.8 project@com.oracle.graal.compiler.common@workingSets=Graal,Java