Rename MiniYaml MergeLiberal -> MergePartial, MergeStrict -> Merge.

This commit is contained in:
Paul Chote
2015-05-10 15:45:33 +01:00
committed by Oliver Brakmann
parent abed25d293
commit a074bb1d4b
14 changed files with 21 additions and 21 deletions

View File

@@ -33,7 +33,7 @@ namespace OpenRA.Graphics
cachedSheets = new Dictionary<string, Sheet>();
cachedSprites = new Dictionary<string, Dictionary<string, Sprite>>();
var chrome = chromeFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergeLiberal);
var chrome = chromeFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergePartial);
foreach (var c in chrome)
LoadCollection(c.Key, c.Value);