Reviewers: pdr, Description: 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.
Please review this at http://gwt-code-reviews.appspot.com/1422801/ Affected files: M user/src/com/google/gwt/user/User.gwt.xml Index: user/src/com/google/gwt/user/User.gwt.xml =================================================================== --- user/src/com/google/gwt/user/User.gwt.xml (revision 9995) +++ user/src/com/google/gwt/user/User.gwt.xml (working copy) @@ -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
