Revision: 10013
Author: jlaba...@google.com
Date: Mon Apr 18 05:33:30 2011
Log: Removing duplicate entries from User.gwt.xml that were added in
r9976 due to an undetected merge conflict with r9879, in which the entries
were sorted alphabetically.
Review at http://gwt-code-reviews.appspot.com/1422801
Review by: p...@google.com
http://code.google.com/p/google-web-toolkit/source/detail?r=10013
Modified:
/trunk/user/src/com/google/gwt/user/User.gwt.xml
=======================================
--- /trunk/user/src/com/google/gwt/user/User.gwt.xml Tue Apr 12 06:14:57
2011
+++ /trunk/user/src/com/google/gwt/user/User.gwt.xml Mon Apr 18 05:33:30
2011
@@ -27,6 +27,7 @@
<inherits name="com.google.gwt.layout.Layout"/>
<inherits name="com.google.gwt.media.Media"/>
<inherits name="com.google.gwt.resources.Resources"/>
+ <inherits name="com.google.gwt.safecss.SafeCss" />
<inherits name="com.google.gwt.safehtml.SafeHtml" />
<inherits name="com.google.gwt.storage.Storage" />
<inherits name="com.google.gwt.text.Text"/>
@@ -54,15 +55,6 @@
<inherits name="com.google.gwt.user.SplitPanel"/>
<inherits name="com.google.gwt.user.TextBox"/>
<inherits name="com.google.gwt.user.Tree"/>
- <inherits name="com.google.gwt.user.Hyperlink"/>
- <inherits name="com.google.gwt.user.FileUpload"/>
- <inherits name="com.google.gwt.user.ResizeLayoutPanel"/>
- <inherits name="com.google.gwt.user.ScrollPanel"/>
- <inherits name="com.google.gwt.user.datepicker.DatePicker"/>
- <inherits name="com.google.gwt.user.cellview.CellView"/>
- <inherits name="com.google.gwt.safecss.SafeCss" />
- <inherits name="com.google.gwt.safehtml.SafeHtml" />
- <inherits name="com.google.gwt.storage.Storage" />
<inherits name="com.google.gwt.user.Window" />
<inherits name="com.google.gwt.widget.Widget"/>
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
