Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@ -284,7 +284,7 @@ namespace System.Web.UI.WebControls {
}
[Browsable (true)]
public virtual new string SkinID
public override string SkinID
{
get { return base.SkinID; }
set { base.SkinID = value; }