diff options
| author | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-01-25 15:24:18 +0100 |
|---|---|---|
| committer | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-01-25 15:24:18 +0100 |
| commit | f814d40ea917592f78d2e8ca4c78f34ce4b5f297 (patch) | |
| tree | cafac6a0d757419132fd75ab788f8163a619780b /build.xml | |
| parent | 85daadef89a9ed5c3901a5822221366ee6746d49 (diff) | |
| parent | de2b0c68785afc0f801fbe8d2750366e90c9fa70 (diff) | |
| download | scala-f814d40ea917592f78d2e8ca4c78f34ce4b5f297.tar.gz scala-f814d40ea917592f78d2e8ca4c78f34ce4b5f297.tar.bz2 scala-f814d40ea917592f78d2e8ca4c78f34ce4b5f297.zip | |
Merge branch 'master' into execution-context
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -941,9 +941,6 @@ PACKED QUICK BUILD (PACK) <fileset dir="${build-quick.dir}/classes/library"> <include name="scala/swing/**"/> </fileset> - <fileset dir="${src.dir}/swing"> - <include name="scala/swing/test/images/**"/> - </fileset> </jar> </target> @@ -1543,7 +1540,6 @@ DOCUMENTATION <exclude name="runtime/*$.scala"/> <exclude name="runtime/ScalaRunTime.scala"/> <exclude name="runtime/StringAdd.scala"/> - <exclude name="scala/swing/test/**"/> </scaladoc> <touch file="${build-docs.dir}/library.complete" verbose="no"/> <stopwatch name="docs.lib.timer" action="total"/> |