diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-02 13:21:06 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-02 16:18:35 +0200 |
| commit | 49f50727944a478bc5d10ad0658437286f47e422 (patch) | |
| tree | c4e7a931f24cccf3c371fca440ad94dd19efd371 /build.xml | |
| parent | 5819b78c25c9cba25fc84018d3905fe265bb4e18 (diff) | |
| parent | 98972c95ab1e7c0ea2af9c9a958c0de60eb26b3d (diff) | |
| download | scala-49f50727944a478bc5d10ad0658437286f47e422.tar.gz scala-49f50727944a478bc5d10ad0658437286f47e422.tar.bz2 scala-49f50727944a478bc5d10ad0658437286f47e422.zip | |
Merge 2.10.x into master
Conflicts:
bincompat-forward.whitelist.conf
src/compiler/scala/tools/nsc/matching/Patterns.scala
src/compiler/scala/tools/nsc/transform/patmat/Logic.scala
src/compiler/scala/tools/nsc/typechecker/Infer.scala
src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala
test/files/neg/t5663-badwarneq.check
Diffstat (limited to 'build.xml')
| -rwxr-xr-x | build.xml | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -762,6 +762,7 @@ TODO: <stopwatch name="@{project}.timer"/> <mkdir dir="${@{project}-classes}"/> <javac + debug="true" srcdir="${src.dir}/@{project}" destdir="${@{project}-classes}" classpath="${@{project}-classes}" @@ -794,6 +795,7 @@ TODO: <sequential> <javac + debug="true" srcdir="${src.dir}/@{project}" destdir="${build-@{stage}.dir}/classes/@{destproject}" includes="**/*.java" |