diff options
| author | Paul Phillips <paulp@improving.org> | 2013-02-01 17:38:56 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-02-01 17:38:56 -0800 |
| commit | a45a78a1d4111709acdc0bca9a1ac869a8e53ea5 (patch) | |
| tree | 5c909c41db2470c460cbb3c33672294c9342b914 /build.xml | |
| parent | 26de4394b19d6614b7d414b33f66ebf7adcb8833 (diff) | |
| parent | 644eb7078a11613a06dcaaefb807cbcc44f65ea7 (diff) | |
| download | scala-a45a78a1d4111709acdc0bca9a1ac869a8e53ea5.tar.gz scala-a45a78a1d4111709acdc0bca9a1ac869a8e53ea5.tar.bz2 scala-a45a78a1d4111709acdc0bca9a1ac869a8e53ea5.zip | |
Merge commit '644eb7078a' into wip/fresh-merge2
Conflicts:
build.xml
src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1252,6 +1252,7 @@ QUICK BUILD (QUICK) <pathelement location="${build-quick.dir}/classes/partest"/> <pathelement location="${ant.jar}"/> <path refid="forkjoin.classpath"/> + <path refid="asm.classpath"/> <pathelement location="${scalacheck.jar}"/> </compilationpath> </scalacfork> |