Revision: 6277 Author: [email protected] Date: Wed Sep 30 21:52:49 2009 Log: Pick up dev/build.xml fix from branches/farewellSwt
svn merge --ignore-ancestry \ https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt -c6276 . http://code.google.com/p/google-web-toolkit/source/detail?r=6277 Modified: /releases/2.0/branch-info.txt /releases/2.0/dev/build.xml ======================================= --- /releases/2.0/branch-info.txt Wed Sep 30 20:40:08 2009 +++ /releases/2.0/branch-info.txt Wed Sep 30 21:52:49 2009 @@ -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 . ======================================= --- /releases/2.0/dev/build.xml Mon Sep 28 08:46:02 2009 +++ /releases/2.0/dev/build.xml Wed Sep 30 21:52:49 2009 @@ -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/"/> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
