Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@ -45,9 +45,9 @@ namespace System.Web.UI.WebControls
PropertyDescriptor[] urlProperties;
static string[] emptyFields;
public override bool Initialize (bool sortingEnabled, Control control)
public override bool Initialize (bool enableSorting, Control control)
{
return base.Initialize (sortingEnabled, control);
return base.Initialize (enableSorting, control);
}
[EditorAttribute ("System.Web.UI.Design.WebControls.DataFieldEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]