merge -r 60814:60815

[mono.git] / mcs / class / System.Drawing / System.Drawing.Text / TextRenderingHint.cs

diff --git a/mcs/class/System.Drawing/System.Drawing.Text/TextRenderingHint.cs b/mcs/class/System.Drawing/System.Drawing.Text/TextRenderingHint.cs
index 0a2cc394378ea71ca0d81fbc8a05b03e8a6b9d38..143350350f37807119a8ff31fe4cc76a61b47e8e 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Text/TextRenderingHint.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Text/TextRenderingHint.cs
@@ -1,11 +1,9 @@
 //
 // System.Drawing.TextRenderingHint.cs
 //
-// (C) 2002 Ximian, Inc.  http://www.ximian.com
 // Author: Dennis Hayes (dennish@raytek.com)
 //
-
-//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
@@ -27,10 +25,12 @@
 // 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.Text 
-{
+
+namespace System.Drawing.Text {
+
+#if ONLY_1_1
        [Serializable]
+#endif
        public enum TextRenderingHint {
                AntiAlias = 4,
                AntiAliasGridFit = 3,