Merge remote-tracking branch 'origin/master'

Browse Source

Conflicts:
	spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs
	spine-unity/Assets/spine-unity/SkeletonDataAsset.cs

...

This commit is contained in:

NathanSweet 2015-03-29 18:26:05 +02:00

parent 1ccef4f1cf d5c68c5d7b

commit 412ec15442

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

Diff Content Not Available