comparison 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
comparison
equal deleted inserted replaced
13804:3840d61e0e68 13805:739194d1e813
22 library@JACOCOREPORT@urls=http://lafo.ssw.uni-linz.ac.at/jacoco/jacocoreport.jar 22 library@JACOCOREPORT@urls=http://lafo.ssw.uni-linz.ac.at/jacoco/jacocoreport.jar
23 23
24 library@DACAPO_SCALA@path=lib/dacapo-scala-0.1.0-20120216.jar 24 library@DACAPO_SCALA@path=lib/dacapo-scala-0.1.0-20120216.jar
25 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 25 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
26 26
27 library@OKRA@path=lib/okra-1.5.jar 27 library@OKRA@path=lib/okra-1.6.jar
28 library@OKRA@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.5.jar 28 library@OKRA@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.6.jar
29 library@OKRA@sourcePath=lib/okra-1.5-src.jar 29 library@OKRA@sourcePath=lib/okra-1.6-src.jar
30 library@OKRA@sourceUrls=http://cr.openjdk.java.net/~tdeneau/okra-1.5-src.jar 30 library@OKRA@sourceUrls=http://cr.openjdk.java.net/~tdeneau/okra-1.6-src.jar
31 31
32 library@OKRA_WITH_SIM@path=lib/okra-1.5-with-sim.jar 32 library@OKRA_WITH_SIM@path=lib/okra-1.6-with-sim.jar
33 library@OKRA_WITH_SIM@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.5-with-sim.jar 33 library@OKRA_WITH_SIM@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.6-with-sim.jar
34 library@OKRA_WITH_SIM@sourcePath=lib/okra-1.5-with-sim-src.jar 34 library@OKRA_WITH_SIM@sourcePath=lib/okra-1.6-with-sim-src.jar
35 library@OKRA_WITH_SIM@sourceUrls=http://cr.openjdk.java.net/~tdeneau/okra-1.5-with-sim-src.jar 35 library@OKRA_WITH_SIM@sourceUrls=http://cr.openjdk.java.net/~tdeneau/okra-1.6-with-sim-src.jar
36 36
37 library@JRUBYPARSER@path=lib/jrubyparser-0.5.0.jar 37 library@JRUBYPARSER@path=lib/jrubyparser-0.5.0.jar
38 library@JRUBYPARSER@urls=http://repo1.maven.org/maven2/org/jruby/jrubyparser/0.5.0/jrubyparser-0.5.0.jar 38 library@JRUBYPARSER@urls=http://repo1.maven.org/maven2/org/jruby/jrubyparser/0.5.0/jrubyparser-0.5.0.jar
39 39
40 library@JLINE@path=lib/jline-2.10.jar 40 library@JLINE@path=lib/jline-2.10.jar