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

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var nodes = sequenceFiles
.Select(s => MiniYaml.FromFile(s))
.Aggregate(MiniYaml.MergeLiberal);
.Aggregate(MiniYaml.MergePartial);
foreach (var n in nodes)
Game.ModData.SpriteSequenceLoader.ParseSequences(Game.ModData, ts, sc, n);