diff options
| author | Paul Phillips <paulp@improving.org> | 2012-12-06 12:20:31 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-12-06 12:20:31 -0800 |
| commit | 6ee2ce50a56237eed07bcc6b6198f97779208a02 (patch) | |
| tree | df7a9386e892beafff42bddcc0347f9337cfd3df /tools | |
| parent | 330c77b097782ed389a83175302379ea72d22c41 (diff) | |
| parent | 96fa31d0a3cf7ff401f9197cd0e12acd296e55b1 (diff) | |
| download | scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.tar.gz scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.tar.bz2 scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.zip | |
Merge commit 'refs/pull/1718/head' into merge-msil-genjvm-delete
* commit 'refs/pull/1718/head':
Expunged the .net backend.
Conflicts:
build.detach.xml
build.examples.xml
build.xml
project/Build.scala
src/compiler/scala/tools/ant/Scalac.scala
src/compiler/scala/tools/nsc/Global.scala
src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala
src/compiler/scala/tools/nsc/transform/Mixin.scala
src/intellij/compiler.iml.SAMPLE
tools/buildcp
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/buildcp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/buildcp b/tools/buildcp index 792d8d60b0..3ae70e10a3 100755 --- a/tools/buildcp +++ b/tools/buildcp @@ -8,4 +8,4 @@ lib=$($dir/abspath $dir/../lib) build=$($dir/abspath $dir/../build) cp=$($dir/cpof $build/$1/classes):$build/asm/classes -echo $cp:$lib/msil.jar:$lib/forkjoin.jar:$lib/jline.jar:$lib/extra/'*' +echo $cp:$lib/forkjoin.jar:$lib/jline.jar:$lib/extra/'*' |