Pick up dev/build.xml fix from branches/farewellSwt
svn merge --ignore-ancestry \
https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt -c6276 .
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.0@6277 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/branch-info.txt b/branch-info.txt
index ad45016..b85d6b0 100644
--- a/branch-info.txt
+++ b/branch-info.txt
@@ -2,3 +2,8 @@
========================
svn cp https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt \
https://google-web-toolkit.googlecode.com/svn/releases/2.0
+
+Merges to this branch
+========================
+svn merge --ignore-ancestry \
+ https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt -c6276 .
diff --git a/dev/build.xml b/dev/build.xml
index 40e7495..d396807 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -264,7 +264,6 @@
<fileset dir="${javac.out}" />
<fileset dir="${project.build}/bin" />
<fileset file="${project.build}/alldeps.jar" />
- <fileset dir="${gwt.tools.soyc}/images"/>
<fileset file="${gwt.tools.soyc}/classLevel.css"/>
<fileset file="${gwt.tools.soyc}/roundedCorners.css"/>
</sourcefiles>
@@ -283,7 +282,6 @@
<fileset dir="${javac.out}" />
<zipfileset src="${alldeps.jar}" />
- <zipfileset dir="${gwt.tools.soyc}/images" prefix="com/google/gwt/soyc/resources/images"/>
<zipfileset file="${gwt.tools.soyc}/classLevel.css" prefix="com/google/gwt/soyc/resources/"/>
<zipfileset file="${gwt.tools.soyc}/roundedCorners.css" prefix="com/google/gwt/soyc/resources/"/>
