Revision: 7276
Author: [email protected]
Date: Tue Dec 8 13:43:24 2009
Log: Merge trunk r7275 into this branch
Javadoc fixes for JSONP.
svn merge --ignore-ancestry -c7275 \
https://google-web-toolkit.googlecode.com/svn/trunk/ .
http://code.google.com/p/google-web-toolkit/source/detail?r=7276
Modified:
/releases/2.0/branch-info.txt
/releases/2.0/doc/build.xml
=======================================
--- /releases/2.0/branch-info.txt Mon Dec 7 15:50:49 2009
+++ /releases/2.0/branch-info.txt Tue Dec 8 13:43:24 2009
@@ -1204,3 +1204,8 @@
Javadoc fixes for deRPC.
svn merge --ignore-ancestry -c7264 \
https://google-web-toolkit.googlecode.com/svn/trunk/ .
+
+tr...@7275 was merged into this branch
+ Javadoc fixes for JSONP.
+ svn merge --ignore-ancestry -c7275 \
+ https://google-web-toolkit.googlecode.com/svn/trunk/ .
=======================================
--- /releases/2.0/doc/build.xml Mon Dec 7 15:50:49 2009
+++ /releases/2.0/doc/build.xml Tue Dec 8 13:43:24 2009
@@ -10,7 +10,7 @@
<property.ensure name="gwt.dev.jar"
location="${gwt.build.lib}/gwt-dev.jar" />
<property name="USER_PKGS"
-
value="com.google.gwt.animation.client;com.google.gwt.benchmarks.client;com.google.gwt.core.client;com.google.gwt.core.ext;com.google.gwt.core.ext.soyc;com.google.gwt.core.ext.linker;com.google.gwt.core.ext.typeinfo;com.google.gwt.core.linker;com.google.gwt.debug.client;com.google.gwt.dom.client;com.google.gwt.event.dom.client;com.google.gwt.event.logical.shared;com.google.gwt.event.shared;com.google.gwt.http.client;com.google.gwt.i18n.client;com.google.gwt.i18n.shared;com.google.gwt.i18n.client.constants;com.google.gwt.i18n.rebind.format;com.google.gwt.i18n.rebind.keygen;com.google.gwt.json.client;com.google.gwt.junit.client;com.google.gwt.benchmarks.client;com.google.gwt.resources.client;com.google.gwt.resources.ext;com.google.gwt.user.client;com.google.gwt.user.client.rpc;com.google.gwt.user.client.ui;com.google.gwt.user.datepicker.client;com.google.gwt.user.server.rpc;com.google.gwt.xml.client;com.google.gwt.uibinder.client;com.google.gwt.rpc.client;com.google.gwt.rpc.server"/>
+
value="com.google.gwt.animation.client;com.google.gwt.benchmarks.client;com.google.gwt.core.client;com.google.gwt.core.ext;com.google.gwt.core.ext.soyc;com.google.gwt.core.ext.linker;com.google.gwt.core.ext.typeinfo;com.google.gwt.core.linker;com.google.gwt.debug.client;com.google.gwt.dom.client;com.google.gwt.event.dom.client;com.google.gwt.event.logical.shared;com.google.gwt.event.shared;com.google.gwt.http.client;com.google.gwt.i18n.client;com.google.gwt.i18n.shared;com.google.gwt.i18n.client.constants;com.google.gwt.i18n.rebind.format;com.google.gwt.i18n.rebind.keygen;com.google.gwt.json.client;com.google.gwt.junit.client;com.google.gwt.benchmarks.client;com.google.gwt.resources.client;com.google.gwt.resources.ext;com.google.gwt.user.client;com.google.gwt.user.client.rpc;com.google.gwt.user.client.ui;com.google.gwt.user.datepicker.client;com.google.gwt.user.server.rpc;com.google.gwt.xml.client;com.google.gwt.uibinder.client;com.google.gwt.rpc.client;com.google.gwt.rpc.server;com.google.gwt.jsonp.client"/>
<property name="LANG_PKGS"
value="java.lang;java.lang.annotation;java.util;java.io;java.sql" />
<!-- Individual classes to include when we don't want to
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
