Merge branch 'master' of https://github.com/marek-stoj/NReadability

Conflicts: NReadability.build NReadability.nuspec Src/NReadability/NReadability.Console/Properties/AssemblyInfo.cs Src/NReadability/NReadability.Tests/NReadability.Tests.csproj Src/NReadability/NReadability.Tests/NReadabilityWebTranscoderTests.cs Src/NReadability/NReadability.Tests/Properties/AssemblyInfo.cs Src/NReadability/NReadability.Tests/SampleWebInput/SampleInput_09_1.html Src/NReadability/NReadability.Tests/SampleWebInput/SampleInput_09_2.html Src/NReadability/NReadability/NReadability.csproj Src/NReadability/NReadability/NReadabilityTranscoder.cs Src/NReadability/NReadability/NReadabilityWebTranscoder.cs Src/NReadability/NReadability/Properties/AssemblyInfo.cs Src/NReadability/NReadability/UrlFetcher.cs Manually merged changes from marek-stoj/NReadability
marek-stoj · Jun 29, 2012 · 7aa68b2 · 7aa68b2
2 parents 69c44a3 + cd8b0fc
commit 7aa68b2
Show file tree

Hide file tree

Showing 17 changed files with 5,958 additions and 1,248 deletions.
diff --git a/NReadability.build b/NReadability.build
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <project name="NReadability" default="all">
 
-  <property name="nreadability.version" value="1.4.3.0" />
+  <property name="nreadability.version" value="1.4.4.0" />
   <property name="msbuild.path" value="C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" />
   <property name="git.path" value="C:\Program Files (x86)\Git\bin\git.exe" />
   <property name="nuget.path" value="C:\Programs\NuGet\NuGet.exe" />

diff --git a/NReadability.nuspec b/NReadability.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>NReadability</id>
-    <version>1.4.3</version>
+    <version>1.4.4</version>
     <authors>Marek Stój</authors>
     <owners>Immortal</owners>
     <projectUrl>https://github.com/marek-stoj/NReadability</projectUrl>

diff --git a/Src/NReadability/NReadability.Console/NReadability.Console.csproj b/Src/NReadability/NReadability.Console/NReadability.Console.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

diff --git a/Src/NReadability/NReadability.Console/Properties/AssemblyInfo.cs b/Src/NReadability/NReadability.Console/Properties/AssemblyInfo.cs
@@ -14,5 +14,5 @@
 
 [assembly: Guid("7583466f-c5dd-4a7a-ad53-706b45d0b32d")]
 
-[assembly: AssemblyVersion("1.4.3.0")]
-[assembly: AssemblyFileVersion("1.4.3.0")]
+[assembly: AssemblyVersion("1.4.4.0")]
+[assembly: AssemblyFileVersion("1.4.4.0")]
diff --git a/Src/NReadability/NReadability.Tests/NReadability.Tests.csproj b/Src/NReadability/NReadability.Tests/NReadability.Tests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -92,6 +92,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="SampleInput\SampleInput_15.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="SampleInput\SampleInput_14.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -134,10 +137,10 @@
     <Content Include="SampleInput\SampleInput_12.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SampleWebInput\SampleInput_09_2.html">
+    <Content Include="SampleWebInput\SampleInput_09_1.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SampleWebInput\SampleInput_09_1.html">
+    <Content Include="SampleWebInput\SampleInput_09_2.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="SampleWebInput\SampleInput_08_1.html">