fix merge

1 files changed, 186 insertions, 186 deletions

diff --git a/Prebuild/src/Core/Nodes/ConfigurationNode.cs b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
index cd2f740..a101799 100644
--- a/Prebuild/src/Core/Nodes/ConfigurationNode.cs
+++ b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
@@ -5,16 +5,16 @@ Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehea
 Redistribution and use in source and binary forms, with or without modification, are permitted
 provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this list of conditions 
-  and the following disclaimer. 
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions 
-  and the following disclaimer in the documentation and/or other materials provided with the 
-  distribution. 
-* The name of the author may not be used to endorse or promote products derived from this software 
-  without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+* Redistributions of source code must retain the above copyright notice, this list of conditions
+  and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions
+  and the following disclaimer in the documentation and/or other materials provided with the
+  distribution.
+* The name of the author may not be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
@@ -32,185 +32,185 @@ using Prebuild.Core.Utilities;
 
 namespace Prebuild.Core.Nodes
 {
-        /// <summary>
-        /// 
-        /// </summary>
-        [DataNode("Configuration")]
-        public class ConfigurationNode : DataNode, ICloneable, IComparable
-        {
-                #region Fields
-
-                private string m_Name = "unknown";
-                private string m_Platform = "AnyCPU";
-                private OptionsNode m_Options;
-
-                #endregion
-
-                #region Constructors
-
-                /// <summary>
-                /// Initializes a new instance of the <see cref="ConfigurationNode"/> class.
-                /// </summary>
-                public ConfigurationNode()
-                {
-                        m_Options = new OptionsNode();
-                }
-
-                #endregion
-
-                #region Properties
-
-                /// <summary>
-                /// Gets or sets the parent.
-                /// </summary>
-                /// <value>The parent.</value>
-                public override IDataNode Parent
-                {
-                        get
-                        {
-                                return base.Parent;
-                        }
-                        set
-                        {
-                                base.Parent = value;
-                                if(base.Parent is SolutionNode)
-                                {
-                                        SolutionNode node = (SolutionNode)base.Parent;
-                                        if(node != null && node.Options != null)
-                                        {
-                                                node.Options.CopyTo(m_Options);
-                                        }
-                                }
-                        }
-                }
-
-                /// <summary>
-                /// Identifies the platform for this specific configuration.
-                /// </summary>
-                public string Platform
-                {
-                        get
-                        {
-                                return m_Platform;
-                        }
-                        set
-                        {
-                                switch ((value + "").ToLower())
-                                {
-                                case "x86":
-                                case "x64":
-                                        m_Platform = value;
-                                        break;
-                                case "itanium":
-                                        m_Platform = "Itanium";
-                                        break;
-                                default:
-                                        m_Platform = "AnyCPU";
-                                        break;
-                                }
-                        }
-                }
-
-                /// <summary>
-                /// Gets the name.
-                /// </summary>
-                /// <value>The name.</value>
-                public string Name
-                {
-                        get
-                        {
-                                return m_Name;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the name and platform for the configuration.
-                /// </summary>
-                /// <value>The name and platform.</value>
-                public string NameAndPlatform
-                {
-                        get
-                        {
+    /// <summary>
+    ///
+    /// </summary>
+    [DataNode("Configuration")]
+    public class ConfigurationNode : DataNode, ICloneable, IComparable
+    {
+        #region Fields
+
+        private string m_Name = "unknown";
+        private string m_Platform = "AnyCPU";
+        private OptionsNode m_Options;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConfigurationNode"/> class.
+        /// </summary>
+        public ConfigurationNode()
+        {
+            m_Options = new OptionsNode();
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the parent.
+        /// </summary>
+        /// <value>The parent.</value>
+        public override IDataNode Parent
+        {
+            get
+            {
+                return base.Parent;
+            }
+            set
+            {
+                base.Parent = value;
+                if(base.Parent is SolutionNode)
+                {
+                    SolutionNode node = (SolutionNode)base.Parent;
+                    if(node != null && node.Options != null)
+                    {
+                        node.Options.CopyTo(m_Options);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Identifies the platform for this specific configuration.
+        /// </summary>
+        public string Platform
+        {
+            get
+            {
+                return m_Platform;
+            }
+            set
+            {
+                switch ((value + "").ToLower())
+                {
+                case "x86":
+                case "x64":
+                    m_Platform = value;
+                    break;
+                case "itanium":
+                    m_Platform = "Itanium";
+                    break;
+                default:
+                    m_Platform = "AnyCPU";
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get
+            {
+                return m_Name;
+            }
+        }
+
+        /// <summary>
+        /// Gets the name and platform for the configuration.
+        /// </summary>
+        /// <value>The name and platform.</value>
+        public string NameAndPlatform
+        {
+            get
+            {
                 string platform = m_Platform;
                 if (platform == "AnyCPU")
                     platform = "Any CPU";
 
-                                return String.Format("{0}|{1}", m_Name, platform);
-                        }
-                }
-
-                /// <summary>
-                /// Gets or sets the options.
-                /// </summary>
-                /// <value>The options.</value>
-                public OptionsNode Options
-                {
-                        get
-                        {
-                                return m_Options;
-                        }
-                        set
-                        {
-                                m_Options = value;
-                        }
-                }
-
-                #endregion
-
-                #region Public Methods
-
-                /// <summary>
-                /// Parses the specified node.
-                /// </summary>
-                /// <param name="node">The node.</param>
-                public override void Parse(XmlNode node)
-                {
-                        m_Name = Helper.AttributeValue(node, "name", m_Name);
-                        Platform = Helper.AttributeValue(node, "platform", m_Platform);
-
-                        if (node == null)
-                        {
-                                throw new ArgumentNullException("node");
-                        }
-                        foreach(XmlNode child in node.ChildNodes)
-                        {
-                                IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
-                                if(dataNode is OptionsNode)
-                                {
-                                        ((OptionsNode)dataNode).CopyTo(m_Options);
-                                }
-                        }
-                }
-
-                /// <summary>
-                /// Copies to.
-                /// </summary>
-                /// <param name="conf">The conf.</param>
-                public void CopyTo(ConfigurationNode conf)
-                {
-                        m_Options.CopyTo(conf.m_Options);
-                }
-
-                #endregion
-
-                #region ICloneable Members
-
-                /// <summary>
-                /// Creates a new object that is a copy of the current instance.
-                /// </summary>
-                /// <returns>
-                /// A new object that is a copy of this instance.
-                /// </returns>
-                public object Clone()
-                {
-                        ConfigurationNode ret = new ConfigurationNode();
-                        ret.m_Name = m_Name;
-                        ret.m_Platform = m_Platform;
-                        m_Options.CopyTo(ret.m_Options);
-                        return ret;
-                }
-
-                #endregion
+                return String.Format("{0}|{1}", m_Name, platform);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the options.
+        /// </summary>
+        /// <value>The options.</value>
+        public OptionsNode Options
+        {
+            get
+            {
+                return m_Options;
+            }
+            set
+            {
+                m_Options = value;
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Parses the specified node.
+        /// </summary>
+        /// <param name="node">The node.</param>
+        public override void Parse(XmlNode node)
+        {
+            m_Name = Helper.AttributeValue(node, "name", m_Name);
+            Platform = Helper.AttributeValue(node, "platform", m_Platform);
+
+            if (node == null)
+            {
+                throw new ArgumentNullException("node");
+            }
+            foreach(XmlNode child in node.ChildNodes)
+            {
+                IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
+                if(dataNode is OptionsNode)
+                {
+                    ((OptionsNode)dataNode).CopyTo(m_Options);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Copies to.
+        /// </summary>
+        /// <param name="conf">The conf.</param>
+        public void CopyTo(ConfigurationNode conf)
+        {
+            m_Options.CopyTo(conf.m_Options);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        /// <summary>
+        /// Creates a new object that is a copy of the current instance.
+        /// </summary>
+        /// <returns>
+        /// A new object that is a copy of this instance.
+        /// </returns>
+        public object Clone()
+        {
+            ConfigurationNode ret = new ConfigurationNode();
+            ret.m_Name = m_Name;
+            ret.m_Platform = m_Platform;
+            m_Options.CopyTo(ret.m_Options);
+            return ret;
+        }
+
+        #endregion
 
         #region IComparable Members
 
@@ -221,5 +221,5 @@ namespace Prebuild.Core.Nodes
         }
 
         #endregion
-        }
+    }
 }