Merge branch 'dev' into V2

Former-commit-id: fb0acd49d8c616eb157bae537f99f94084e7ede0
12 years ago · f4a0fddea8
2 changed files with 4 additions and 1 deletions
--- a/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj
+++ b/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj
@ -101,6 +101,9 @@
    <Compile Include="..\NET45\Helpers\ImageHelpers.cs">
      <Link>ImageHelpers.cs</Link>
    </Compile>
+    <Compile Include="..\NET45\Helpers\NativeMethods.cs">
+      <Link>NativeMethods.cs</Link>
+    </Compile>
    <Compile Include="..\NET45\Helpers\RemoteFile.cs" />
    <Compile Include="..\NET45\Helpers\ResourceHelpers.cs">
      <Link>ResourceHelpers.cs</Link>
--- a/src/ImageProcessor.Web/NET45/Configuration/ImageProcessorConfiguration.cs
+++ b/src/ImageProcessor.Web/NET45/Configuration/ImageProcessorConfiguration.cs
@ -22,8 +22,8 @@ namespace ImageProcessor.Web.Configuration

    using ImageProcessor.Common.Extensions;
    using ImageProcessor.Processors;
-    using ImageProcessor.Web.Helpers;
    using ImageProcessor.Web.Processors;
+    using ImageProcessor.Web.Helpers;

    /// <summary>
    /// Encapsulates methods to allow the retrieval of ImageProcessor settings.