diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-11-18 16:38:02 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-11-18 16:38:02 +1000 |
| commit | 3513a324b0393e4da38068c0ceffe79927cac46e (patch) | |
| tree | 6038f9a5f100838d83facfc7a7fc15beb22e1405 | |
| parent | bddb3afbcc26a037764ea83b67f3d1cc57dcc8e0 (diff) | |
| parent | 3a949a18cee6b4197a981892f305a9890e402f12 (diff) | |
| download | scala-3513a324b0393e4da38068c0ceffe79927cac46e.tar.gz scala-3513a324b0393e4da38068c0ceffe79927cac46e.tar.bz2 scala-3513a324b0393e4da38068c0ceffe79927cac46e.zip | |
Merge pull request #4129 from gourlaysama/wip/t8977-scalap-decoder-properties
SI-8977 remove duplicate decoder.properties from scalap
| -rwxr-xr-x | build.xml | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -848,8 +848,7 @@ TODO: --> <path id="pack.reflect.files"> <fileset dir="${build-quick.dir}/classes/reflect"/> </path> - <path id="pack.scalap.files"> <fileset dir="${build-quick.dir}/classes/scalap"/> - <fileset file="${src.dir}/scalap/decoder.properties"/> </path> + <path id="pack.scalap.files"> <fileset dir="${build-quick.dir}/classes/scalap"/> </path> <path id="pack.partest-extras.files"> <fileset dir="${build-quick.dir}/classes/partest-extras"/> </path> <path id="pack.partest-javaagent.files"> <fileset dir="${build-quick.dir}/classes/partest-javaagent"/> </path> |