Mercurial > hg > graal-compiler
comparison mx/projects @ 14716:03704aa6e71b
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Fri, 21 Mar 2014 13:54:43 +0100 |
parents | a939edbab5ee |
children | a6c1c3eb20c4 |
comparison
equal
deleted
inserted
replaced
14715:4ea4db3f23ba | 14716:03704aa6e71b |
---|---|
37 library@OKRA_WITH_SIM@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.8-with-sim.jar | 37 library@OKRA_WITH_SIM@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.8-with-sim.jar |
38 library@OKRA_WITH_SIM@sourcePath=lib/okra-1.8-with-sim-src.jar | 38 library@OKRA_WITH_SIM@sourcePath=lib/okra-1.8-with-sim-src.jar |
39 library@OKRA_WITH_SIM@sourceUrls=http://cr.openjdk.java.net/~tdeneau/okra-1.8-with-sim-src.jar | 39 library@OKRA_WITH_SIM@sourceUrls=http://cr.openjdk.java.net/~tdeneau/okra-1.8-with-sim-src.jar |
40 | 40 |
41 library@JAVA_ALLOCATION_INSTRUMENTER@path=lib/java-allocation-instrumenter.jar | 41 library@JAVA_ALLOCATION_INSTRUMENTER@path=lib/java-allocation-instrumenter.jar |
42 library@JAVA_ALLOCATION_INSTRUMENTER@urls=http://lafo.ssw.uni-linz.ac.at/java-allocation-instrumenter/java-allocation-instrumenter.jar | 42 library@JAVA_ALLOCATION_INSTRUMENTER@urls=http://lafo.ssw.uni-linz.ac.at/java-allocation-instrumenter/java-allocation-instrumenter-67ad4ee8beb6.jar |
43 library@JAVA_ALLOCATION_INSTRUMENTER@sha1=1cd4073f57d7d461a53b0ddc1ea4ee2aa0c60e66 | 43 library@JAVA_ALLOCATION_INSTRUMENTER@sha1=1cd4073f57d7d461a53b0ddc1ea4ee2aa0c60e66 |
44 | 44 |
45 distribution@GRAAL@path=graal.jar | 45 distribution@GRAAL@path=graal.jar |
46 distribution@GRAAL@dependencies=\ | 46 distribution@GRAAL@dependencies=\ |
47 com.oracle.graal.hotspot.amd64,\ | 47 com.oracle.graal.hotspot.amd64,\ |