Merge branch 'development' into portable

cureos · Sep 30, 2014 · f40a6e0 · f40a6e0
2 parents 59a8cb9 + 9a6a7a1
commit f40a6e0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Sources/Accord.Core/Accord.Core.csproj b/Sources/Accord.Core/Accord.Core.csproj
@@ -117,7 +117,7 @@
     <Compile Include="Compatibility\SpinLock.cs" />
     <Compile Include="Compatibility\ThreadLocal.cs" />
     <Compile Include="Compatibility\Tuple.cs" />
-    <Compile Include="Extensions.cs" />
+    <Compile Include="ExtensionMethods.cs" />
     <Compile Include="Exceptions\ConvergenceException.cs" />
     <Compile Include="Exceptions\DimensionMismatchException.cs" />
     <Compile Include="Exceptions\NonPositiveDefiniteMatrixException.cs" />

diff --git a/Sources/Accord.Core/Extensions.cs → Sources/Accord.Core/ExtensionMethods.cs b/Sources/Accord.Core/Extensions.cs → Sources/Accord.Core/ExtensionMethods.cs
@@ -34,7 +34,7 @@ namespace Accord
     ///   Static class for utility extension methods.
     /// </summary>
     /// 
-    public static class Extensions
+    public static class ExtensionMethods
     {
 
         /// <summary>