mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/System.Web/System.Web.UI/MasterPage.cs
View File

@ -98,7 +98,6 @@ namespace System.Web.UI
return parentMasterPage;
}
}
#if NET_4_0
public void InstantiateInContentPlaceHolder (Control contentPlaceHolder, ITemplate template)
{
// .NET compatibility...
@ -108,7 +107,6 @@ namespace System.Web.UI
if (contentPlaceHolder != null && template != null)
template.InstantiateIn (contentPlaceHolder);
}
#endif
internal static MasterPage CreateMasterPage (TemplateControl owner, HttpContext context,
string masterPageFile, IDictionary contentTemplateCollection)
{