Merge branch '3.8' into 4.0-beta

Browse Source

# Conflicts:
#	spine-cpp/spine-cpp/include/spine/Atlas.h

...

This commit is contained in:

badlogic 2020-08-13 14:55:37 +02:00

parent 1219d09959 c47ea763fe

commit c3017d82d6

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