Merge WebKit at r74534: Initial merge by git.

Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb

1 files changed, 0 insertions, 27 deletions

diff --git a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePluginCommon.vsprops b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePluginCommon.vsprops
deleted file mode 100644
index 88aa183..0000000
--- a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePluginCommon.vsprops
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioPropertySheet

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="TestNetscapePluginCommon"

-	>

-	<Tool

-		Name="VCCLCompilerTool"

-		AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)..&quot;;&quot;$(WebKitOutputDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;"

-		PreprocessorDefinitions="_USRDLL;TESTNETSCAPEPLUGIN_EXPORTS;snprintf=_snprintf"

-		DisableSpecificWarnings="4819"

-	/>

-	<Tool

-		Name="VCLinkerTool"

-		AdditionalDependencies="Msimg32.lib"

-		OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix)\np$(ProjectName)$(WebKitConfigSuffix).dll"

-		ModuleDefinitionFile="TestNetscapePlugin$(WebKitConfigSuffix).def"

-	/>

-	<Tool

-		Name="VCPostBuildEventTool"

-		CommandLine="if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;"

-	/>

-	<Tool

-		Name="VCPreBuildEventTool"

-		CommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"

-	/>

-</VisualStudioPropertySheet>