pharan d5e75febee Merge branch '3.6' into 3.7-beta ...

# Conflicts:
#	examples/hero/export/hero-pro.json
#	examples/hero/export/hero-pro.skel

2018-04-19 15:02:08 +08:00

..

hero-ess.json

…

hero-ess.skel

…

hero-pma.atlas

…

hero-pma.png

…

hero-pro.json

Merge branch '3.6' into 3.7-beta

2018-04-19 15:02:08 +08:00

hero-pro.skel

Merge branch '3.6' into 3.7-beta

2018-04-19 15:02:08 +08:00

hero.atlas

…

hero.png

…