merge

1 files changed, 94 insertions, 94 deletions

diff --git a/indra/tools/vstool/VSTool.csproj b/indra/tools/vstool/VSTool.csproj
index 24f1031f81..5d8764b6bf 100644
--- a/indra/tools/vstool/VSTool.csproj
+++ b/indra/tools/vstool/VSTool.csproj
@@ -1,95 +1,95 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectType>Local</ProjectType>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{96943E2D-1373-4617-A117-D0F997A94919}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>VSTool</AssemblyName>

-    <AssemblyOriginatorKeyFile>

-    </AssemblyOriginatorKeyFile>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Exe</OutputType>

-    <RootNamespace>VSTool</RootNamespace>

-    <RunPostBuildEvent>Always</RunPostBuildEvent>

-    <StartupObject>VSTool.VSToolMain</StartupObject>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <UpgradeBackupLocation>

-    </UpgradeBackupLocation>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

-    <DebugSymbols>true</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <NoStdLib>false</NoStdLib>

-    <NoWarn>

-    </NoWarn>

-    <Optimize>false</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <DebugType>full</DebugType>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

-    <DebugSymbols>false</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <NoStdLib>false</NoStdLib>

-    <NoWarn>

-    </NoWarn>

-    <Optimize>true</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <DebugType>none</DebugType>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System">

-      <Name>System</Name>

-    </Reference>

-    <Reference Include="System.Data">

-      <Name>System.Data</Name>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="main.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{96943E2D-1373-4617-A117-D0F997A94919}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>VSTool</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>VSTool</RootNamespace>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+    <StartupObject>VSTool.VSToolMain</StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>.\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>.\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="main.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
 </Project>
\ No newline at end of file