Merge branch '3.6' into 3.7-beta

Browse Source

...

This commit is contained in:

badlogic 2018-08-13 16:36:38 +02:00

parent 5f9bc785cb ce536558e5

commit bd778ba417

1 changed files with 824 additions and 731 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1555

spine-cocos2dx/src/spine/SkeletonRenderer.cpp

File diff suppressed because it is too large Load Diff