Merge branch 'master'

[mono.git] / mcs / class / System.Drawing / System.Drawing.Imaging / ImageLockMode.cs

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ImageLockMode.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageLockMode.cs
index 0f810254199753f7f1b50d5eab5c4612c3d1eb6c..e7e091a5168b9ca3e2573db6662ba48cd8ea1873 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Imaging/ImageLockMode.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageLockMode.cs
@@ -1,12 +1,10 @@
 //
 // System.Drawing.Imaging.ImageLockMode.cs
 //
-// (C) 2002 Ximian, Inc.  http://www.ximian.com
 // Author: Dennis Hayes (dennish@raytek.com)
 //
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+// Copyright (C) 2004,2006 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
@@ -27,10 +25,9 @@
 // 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 System.Drawing.Imaging 
-{
-       [Serializable]
+
+namespace System.Drawing.Imaging {
+
        public enum ImageLockMode {
                ReadOnly = 1,
                ReadWrite = 3,