Merge branch '3.6' into 3.7-beta

EsotericSoftware · Dec 11, 2017 · 53c3645 · 53c3645
2 parents 101a3eb + 4048e6b
commit 53c3645
Show file tree

Hide file tree

Showing 2 changed files with 548 additions and 515 deletions.
diff --git a/spine-cocos2dx/src/spine/SkeletonAnimation.h b/spine-cocos2dx/src/spine/SkeletonAnimation.h
@@ -61,7 +61,7 @@ class SkeletonAnimation: public SkeletonRenderer {
 		return SkeletonAnimation::createWithJsonFile(skeletonJsonFile, atlas, scale);
 	}
 	// Use createWithJsonFile instead
-	CC_DEPRECATED_ATTRIBUTE static SkeletonAnimation* createWithile (const std::string& skeletonJsonFile, const std::string& atlasFile, float scale = 1)
+	CC_DEPRECATED_ATTRIBUTE static SkeletonAnimation* createWithFile (const std::string& skeletonJsonFile, const std::string& atlasFile, float scale = 1)
 	{
 		return SkeletonAnimation::createWithJsonFile(skeletonJsonFile, atlasFile, scale);
 	}