2 Commits

Author SHA1 Message Date
NathanSweet
4cb9a8b088 Merge branch 'master' of https://github.com/vinova/spine-runtimes into vinova-master
Conflicts:
	spine-cocos2dx/example/Classes/ExampleScene.cpp
2013-03-25 19:20:45 +01:00
Stefan Nguyen
ee25feffbe reorganize structure to match cocos2d-x multi-platform style; create a working iOS example 2013-03-25 14:36:39 +07:00