Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6

Browse Source

...

This commit is contained in:

Stephen Gowen 2017-12-10 12:30:24 -05:00

parent c7ae6d23b1 4048e6b7f5

commit 0764543bf5

1 changed files with 569 additions and 557 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

1126

spine-unity/Assets/spine-unity/Asset Types/Editor/SkeletonDataAssetInspector.cs

File diff suppressed because it is too large Load Diff