Revision: 8626
Author: [email protected]
Date: Mon Aug 23 11:11:04 2010
Log: svn merge https://google-web-toolkit.googlecode.com/svn/trunk -r8599:8600 .
Plus, updated branch-info.txt with this information


http://code.google.com/p/google-web-toolkit/source/detail?r=8626

Modified:
 /branches/2.1M3/branch-info.txt
 /branches/2.1M3/user/build.xml

=======================================
--- /branches/2.1M3/branch-info.txt     Sun Aug 22 16:25:33 2010
+++ /branches/2.1M3/branch-info.txt     Mon Aug 23 11:11:04 2010
@@ -16,5 +16,6 @@
 commited as r8611
r8619 svn merge https://google-web-toolkit.googlecode.com/svn/trunk -r8618:8619 .
 commited as r8620
+ r8600 svn merge https://google-web-toolkit.googlecode.com/svn/trunk -r8599:8600 .
 r8613: Removed the expenses sample from samples

=======================================
--- /branches/2.1M3/user/build.xml      Fri Aug 13 06:36:43 2010
+++ /branches/2.1M3/user/build.xml      Mon Aug 23 11:11:04 2010
@@ -59,6 +59,9 @@
     <pathelement location="${gwt.tools.lib}/easymock/easymock.jar"/>
<pathelement location="${gwt.tools.lib}/easymock/easymockclassextension.jar"/>
     <pathelement location="${gwt.tools.lib}/objectweb/asm-3.1.jar"/>
+ <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" /> + <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar" /> + <pathelement location="${gwt.tools}/redist/json/r2_20080312/json-1.5.jar" />
     <pathelement location="${gwt.dev.jar}" />
   </path>

@@ -108,8 +111,6 @@
         <pathelement location="${javac.out}" />
         <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
<pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" /> - <pathelement location="${gwt.tools}/redist/json/r2_20080312/json-1.5.jar" /> - <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
         <path refid="test.extraclasspath" />
       </classpath>
     </gwt.javac>

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to