comparison mx/projects @ 15917:7c84f0ce7cae

Merge.
author Doug Simon <doug.simon@oracle.com>
date Mon, 26 May 2014 18:55:21 +0200
parents 6aa352b260f4 67e0015b21d6
children d676c4beeab8
comparison
equal deleted inserted replaced
15916:6aa352b260f4 15917:7c84f0ce7cae
34 library@JACOCOAGENT@path=lib/jacocoagent.jar 34 library@JACOCOAGENT@path=lib/jacocoagent.jar
35 library@JACOCOAGENT@urls=http://lafo.ssw.uni-linz.ac.at/jacoco/jacocoagent-0.7.1-1.jar 35 library@JACOCOAGENT@urls=http://lafo.ssw.uni-linz.ac.at/jacoco/jacocoagent-0.7.1-1.jar
36 library@JACOCOAGENT@sha1=2f73a645b02e39290e577ce555f00b02004650b0 36 library@JACOCOAGENT@sha1=2f73a645b02e39290e577ce555f00b02004650b0
37 37
38 library@JACOCOREPORT@path=lib/jacocoreport.jar 38 library@JACOCOREPORT@path=lib/jacocoreport.jar
39 library@JACOCOREPORT@urls=http://lafo.ssw.uni-linz.ac.at/jacoco/jacocoreport-0.7.1-1.jar 39 library@JACOCOREPORT@urls=http://lafo.ssw.uni-linz.ac.at/jacoco/jacocoreport-0.7.1-2.jar
40 library@JACOCOREPORT@sha1=0c5db714804416dd1df4d8110762136ce3d5c7dc 40 library@JACOCOREPORT@sha1=a630436391832d697a12c8f7daef8655d7a1efd2
41 41
42 library@DACAPO_SCALA@path=lib/dacapo-scala-0.1.0-20120216.jar 42 library@DACAPO_SCALA@path=lib/dacapo-scala-0.1.0-20120216.jar
43 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 43 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
44 library@DACAPO_SCALA@sha1=59b64c974662b5cf9dbd3cf9045d293853dd7a51 44 library@DACAPO_SCALA@sha1=59b64c974662b5cf9dbd3cf9045d293853dd7a51
45 45