Imported Upstream version 4.0.0~alpha1

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

View File

@@ -28,7 +28,6 @@
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
//
#if NET_2_0
using System;
using System.Globalization;
@@ -41,11 +40,7 @@ namespace System.Web.UI.WebControls
[ControlBuilder (typeof(MultiViewControlBuilder))]
[Designer ("System.Web.UI.Design.WebControls.MultiViewDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
[ToolboxData ("<{0}:MultiView runat=\"server\"></{0}:MultiView>")]
#if NET_2_0
[ParseChildren (typeof(View))]
#else
[ParseChildren (false)]
#endif
[DefaultEvent ("ActiveViewChanged")]
public class MultiView: Control
{
@@ -232,4 +227,3 @@ namespace System.Web.UI.WebControls
}
}
#endif