na-get-lib,共用ユーティリティ関数のtypo修正。(MergeEnumerable)

diff --git a/AppliStation/InstallationConfirmForm.cs b/AppliStation/InstallationConfirmForm.cs
index fa04ecb..7c06074 100644 (file)
--- a/AppliStation/InstallationConfirmForm.cs
+++ b/AppliStation/InstallationConfirmForm.cs
@@ -20,7 +20,7 @@ namespace AppliStation
 \r
                public IEnumerable<Installation> Installations {\r
                        get {\r
-                               return NaGet.Utils.MeargeEnumerable<Installation>(requiredInstallations, selectedInstallations);\r
+                               return NaGet.Utils.MergeEnumerable<Installation>(requiredInstallations, selectedInstallations);\r
                        }\r
                        set {\r
                                requiredInstallations = null;\r

diff --git a/na-get-lib/NaGet.Packages/PackageListsManager.cs b/na-get-lib/NaGet.Packages/PackageListsManager.cs
index d5b1d43..ebe080d 100644 (file)
--- a/na-get-lib/NaGet.Packages/PackageListsManager.cs
+++ b/na-get-lib/NaGet.Packages/PackageListsManager.cs
@@ -199,7 +199,7 @@ namespace NaGet.Packages
                /// <returns>全てのインストールされたパッケージのイテレータ</returns>\r
                public IEnumerable<InstalledPackage> GetAllInstalledPackages()\r
                {\r
-                       return NaGet.Utils.MeargeEnumerable<InstalledPackage>(\r
+                       return NaGet.Utils.MergeEnumerable<InstalledPackage>(\r
                                installedPkgList.GetEnumerator(),\r
                                systemInstalledPkgList.GetEnumerator()\r
                        );\r
@@ -211,7 +211,7 @@ namespace NaGet.Packages
                /// <returns>パッケージのイテレータ</returns>\r
                public IEnumerable<Package> GetAllPackages()\r
                {\r
-                       return NaGet.Utils.MeargeEnumerable<Package>(\r
+                       return NaGet.Utils.MergeEnumerable<Package>(\r
                                availablePkgList.GetEnumerator(),\r
                                (IEnumerator<Package>) GetAllInstalledPackages().GetEnumerator()\r
                        );\r

diff --git a/na-get-lib/NaGet/Utils.cs b/na-get-lib/NaGet/Utils.cs
index 1d71ba5..7f662d9 100644 (file)
--- a/na-get-lib/NaGet/Utils.cs
+++ b/na-get-lib/NaGet/Utils.cs
@@ -45,7 +45,7 @@ namespace NaGet
                /// </summary>\r
                /// <param name="enus">元となる複数のイテレータ</param>\r
                /// <returns>結合されたイテレータ</returns>\r
-               public static IEnumerable<T> MeargeEnumerable<T>(params IEnumerable<T>[] enus)\r
+               public static IEnumerable<T> MergeEnumerable<T>(params IEnumerable<T>[] enus)\r
                {\r
                        foreach (IEnumerable<T> enu in enus) {\r
                                if (enu == null) continue;\r
@@ -61,7 +61,7 @@ namespace NaGet
                /// </summary>\r
                /// <param name="enus">元となる複数のイテレータ</param>\r
                /// <returns>結合されたイテレータ</returns>\r
-               public static IEnumerable<T> MeargeEnumerable<T>(params IEnumerator<T>[] enus)\r
+               public static IEnumerable<T> MergeEnumerable<T>(params IEnumerator<T>[] enus)\r
                {\r
                        foreach (IEnumerator<T> enu in enus) {\r
                                if (enu == null) continue;\r