Merge remote-tracking branch 'origin/master'

This commit is contained in:
NathanSweet 2013-05-31 10:40:50 +02:00
commit 2e8f66631e

View File

@ -221,7 +221,7 @@ public class SkeletonJson {
for each (var valueMap3:Object in values2) {
timeline3.setFrame(frameIndex3++, valueMap3["time"], valueMap3["name"]);
}
timelines.push(timeline);
timelines.push(timeline3);
duration = Math.max(duration, timeline3.frames[timeline3.frameCount - 1]);
} else