importing messaging-2008 branch to trunk [continued]

[mono.git] / mcs / class / System.Data / System.Data / UpdateStatus.cs

diff --git a/mcs/class/System.Data/System.Data/UpdateStatus.cs b/mcs/class/System.Data/System.Data/UpdateStatus.cs
index b82b187d85dd0857ae1e6ef951d40e1d3ec3b78c..9549713abd1ca157e701b6214d5794fba6c37433 100644 (file)
--- a/mcs/class/System.Data/System.Data/UpdateStatus.cs
+++ b/mcs/class/System.Data/System.Data/UpdateStatus.cs
@@ -7,14 +7,39 @@
 // (C) Chris Podurgiel
 //
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 
-namespace mono.System.Data
+namespace System.Data
 {
        /// <summary>
        /// Specifies the action to take with regard to the current and remaining rows during an Update.
        /// </summary>
+#if !NET_2_0
        [Serializable]
+#endif
        public enum UpdateStatus
        {
                Continue = 0,