Mercurial > hg > truffle
diff mx/projects @ 13805:739194d1e813
Merge.
| author | Christian Humer <christian.humer@gmail.com> |
|---|---|
| date | Tue, 28 Jan 2014 12:55:06 +0100 |
| parents | 2d0be2eca035 |
| children | ed3a1471e133 |
line wrap: on
line diff
--- a/mx/projects Tue Jan 28 12:52:57 2014 +0100 +++ b/mx/projects Tue Jan 28 12:55:06 2014 +0100 @@ -24,15 +24,15 @@ library@DACAPO_SCALA@path=lib/dacapo-scala-0.1.0-20120216.jar library@DACAPO_SCALA@urls=http://repo.scalabench.org/snapshots/org/scalabench/benchmarks/scala-benchmark-suite/0.1.0-SNAPSHOT/scala-benchmark-suite-0.1.0-20120216.103539-3.jar -library@OKRA@path=lib/okra-1.5.jar -library@OKRA@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.5.jar -library@OKRA@sourcePath=lib/okra-1.5-src.jar -library@OKRA@sourceUrls=http://cr.openjdk.java.net/~tdeneau/okra-1.5-src.jar +library@OKRA@path=lib/okra-1.6.jar +library@OKRA@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.6.jar +library@OKRA@sourcePath=lib/okra-1.6-src.jar +library@OKRA@sourceUrls=http://cr.openjdk.java.net/~tdeneau/okra-1.6-src.jar -library@OKRA_WITH_SIM@path=lib/okra-1.5-with-sim.jar -library@OKRA_WITH_SIM@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.5-with-sim.jar -library@OKRA_WITH_SIM@sourcePath=lib/okra-1.5-with-sim-src.jar -library@OKRA_WITH_SIM@sourceUrls=http://cr.openjdk.java.net/~tdeneau/okra-1.5-with-sim-src.jar +library@OKRA_WITH_SIM@path=lib/okra-1.6-with-sim.jar +library@OKRA_WITH_SIM@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.6-with-sim.jar +library@OKRA_WITH_SIM@sourcePath=lib/okra-1.6-with-sim-src.jar +library@OKRA_WITH_SIM@sourceUrls=http://cr.openjdk.java.net/~tdeneau/okra-1.6-with-sim-src.jar library@JRUBYPARSER@path=lib/jrubyparser-0.5.0.jar library@JRUBYPARSER@urls=http://repo1.maven.org/maven2/org/jruby/jrubyparser/0.5.0/jrubyparser-0.5.0.jar