Merge branch 'feature/upstream' into develop

3 files changed, 0 insertions, 512 deletions

diff --git a/win32/Visual_Studio_2005/test.vcproj b/win32/Visual_Studio_2005/test.vcproj
deleted file mode 100644
index 4971e13..0000000
--- a/win32/Visual_Studio_2005/test.vcproj
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8,00"

-	Name="test"

-	ProjectGUID="{9682BD28-DA8C-4E37-810B-FC66EF53AE17}"

-	RootNamespace="test"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="..\uriparser.lib"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="..\uriparser.lib"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-		<ProjectReference

-			ReferencedProjectIdentifier="{8E2F76A2-59B5-4DF7-8062-EBD6FCF0C8B3}"

-			RelativePathToProject=".\uriparser.vcproj"

-		/>

-	</References>

-	<Files>

-		<Filter

-			Name="include"

-			>

-			<Filter

-				Name="uriparser"

-				>

-				<File

-					RelativePath="..\..\include\uriparser\Uri.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\include\uriparser\UriBase.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\include\uriparser\UriDefsAnsi.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\include\uriparser\UriDefsConfig.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\include\uriparser\UriDefsUnicode.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\include\uriparser\UriIp4.h"

-					>

-				</File>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="test"

-			>

-			<File

-				RelativePath="..\..\test\FourSuite.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\test\test.cpp"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/win32/Visual_Studio_2005/uriparser.sln b/win32/Visual_Studio_2005/uriparser.sln
deleted file mode 100644
index cfedaa7..0000000
--- a/win32/Visual_Studio_2005/uriparser.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uriparser", "uriparser.vcproj", "{8E2F76A2-59B5-4DF7-8062-EBD6FCF0C8B3}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test.vcproj", "{9682BD28-DA8C-4E37-810B-FC66EF53AE17}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{8E2F76A2-59B5-4DF7-8062-EBD6FCF0C8B3}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8E2F76A2-59B5-4DF7-8062-EBD6FCF0C8B3}.Debug|Win32.Build.0 = Debug|Win32

-		{8E2F76A2-59B5-4DF7-8062-EBD6FCF0C8B3}.Release|Win32.ActiveCfg = Release|Win32

-		{8E2F76A2-59B5-4DF7-8062-EBD6FCF0C8B3}.Release|Win32.Build.0 = Release|Win32

-		{9682BD28-DA8C-4E37-810B-FC66EF53AE17}.Debug|Win32.ActiveCfg = Debug|Win32

-		{9682BD28-DA8C-4E37-810B-FC66EF53AE17}.Debug|Win32.Build.0 = Debug|Win32

-		{9682BD28-DA8C-4E37-810B-FC66EF53AE17}.Release|Win32.ActiveCfg = Release|Win32

-		{9682BD28-DA8C-4E37-810B-FC66EF53AE17}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/win32/Visual_Studio_2005/uriparser.vcproj b/win32/Visual_Studio_2005/uriparser.vcproj
deleted file mode 100644
index 4299e21..0000000
--- a/win32/Visual_Studio_2005/uriparser.vcproj
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8,00"

-	Name="uriparser"

-	ProjectGUID="{8E2F76A2-59B5-4DF7-8062-EBD6FCF0C8B3}"

-	RootNamespace="uriparser"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\uriparser.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\uriparser.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="include"

-			>

-			<Filter

-				Name="uriparser"

-				>

-				<File

-					RelativePath="..\..\include\uriparser\Uri.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\include\uriparser\UriBase.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\include\uriparser\UriDefsAnsi.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\include\uriparser\UriDefsConfig.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\include\uriparser\UriDefsUnicode.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\include\uriparser\UriIp4.h"

-					>

-				</File>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="lib"

-			>

-			<File

-				RelativePath="..\..\src\UriCommon.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriCommon.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriCompare.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriEscape.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriFile.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriIp4.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriIp4Base.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriIp4Base.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriNormalize.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriNormalizeBase.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriNormalizeBase.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriParse.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriParseBase.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriParseBase.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriQuery.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriRecompose.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriResolve.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\src\UriShorten.c"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>