diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-20 12:19:47 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-20 12:19:47 +0000 |
commit | 517acfdd56af4562d3c4f2963f656f2834ca23e2 (patch) | |
tree | 609c95d6aafff786460300162991ce5b31fe8c32 /build.xml | |
parent | e5ad9c55f8a7a97aa7c36a057078db2031f468e8 (diff) | |
download | scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.tar.gz scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.tar.bz2 scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.zip |
Fixing an incomplete svnmerge; second, merge ag...
Fixing an incomplete svnmerge; second, merge again from trunk.
Diffstat (limited to 'build.xml')
-rw-r--r-- | build.xml | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -375,7 +375,7 @@ LOCAL REFERENCE BUILD (LOCKER) <include name="**/*.properties"/> <include name="**/*.swf"/> <include name="**/*.png"/> - + <include name="**/*.gif"/> </fileset> </copy> <touch file="${build-locker.dir}/compiler.complete" verbose="no"/> @@ -590,6 +590,7 @@ QUICK BUILD (QUICK) <include name="**/*.properties"/> <include name="**/*.swf"/> <include name="**/*.png"/> + <include name="**/*.gif"/> </fileset> </copy> <touch file="${build-quick.dir}/compiler.complete" verbose="no"/> @@ -1101,6 +1102,7 @@ BOOTSTRAPPING BUILD (STRAP) <include name="**/*.properties"/> <include name="**/*.swf"/> <include name="**/*.png"/> + <include name="**/*.gif"/> </fileset> </copy> <touch file="${build-strap.dir}/compiler.complete" verbose="no"/> |