projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[bcl] Rename variables to avoid conflict with later renames
[mono.git]
/
mcs
/
class
/
System.Web
/
System.Web.UI.WebControls
/
XmlDataSourcePropertyDescriptor.cs
diff --git
a/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSourcePropertyDescriptor.cs
b/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSourcePropertyDescriptor.cs
index e005259f7f12d6340a74bf71eb20938ed230a04a..9a3330e93fe0cdb6e82ca9b7ff782c392bf19efe 100644
(file)
--- a/
mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSourcePropertyDescriptor.cs
+++ b/
mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSourcePropertyDescriptor.cs
@@
-28,7
+28,6
@@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System;
using System.Collections;
using System.Xml;
using System;
using System.Collections;
using System.Xml;
@@
-91,5
+90,4
@@
namespace System.Web.UI.WebControls {
}
}
}
}
}
}
-#endif